Support individual channel keys for pre-defined channels.

[ngircd-alex.git] / src / tool / tool.c

diff --git a/src/tool/tool.c b/src/tool/tool.c
index a83906922c1d1239faeaf8bfb4380b208eae517e..a24c160279e77bd5e482b10dbc65d20edd25302e 100644 (file)
--- a/src/tool/tool.c
+++ b/src/tool/tool.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,62 +14,89 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: tool.c,v 1.3 2005/03/19 18:43:52 fw Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <netinet/in.h>
+
 #include "exp.h"
 #include "tool.h"
 
 
+/**
+ * Removes all leading and trailing whitespaces of a string.
+ * @param String The string to remove whitespaces from.
+ */
 GLOBAL void
-ngt_TrimStr( char *String )
+ngt_TrimStr(char *String)
 {
-       /* Mit ngt_TrimStr() werden fuehrende und folgende Leerzeichen,
-        * Tabulatoren und Zeilenumbrueche (ASCII 10 und ASCII 13) aus
-        * dem String entfernt. */
-       
-       char *start, *ptr;
+       char *start, *end;
 
-       assert( String != NULL );
+       assert(String != NULL);
 
        start = String;
-       
-       /* Zeichen am Anfang pruefen ... */
-       while(( *start == ' ' ) || ( *start == 9 )) start++;
-       
-       /* Zeichen am Ende pruefen ... */
-       ptr = strchr( start, '\0' ) - 1;
-       while((( *ptr == ' ' ) || ( *ptr == 9 ) || ( *ptr == 10 ) || ( *ptr == 13 )) && ptr >= start ) ptr--;
-       *(++ptr) = '\0';
-
-       memmove( String, start, strlen( start ) + 1 );
+
+       /* Remove whitespaces at the beginning of the string ... */
+       while (*start == ' ' || *start == '\t' ||
+              *start == '\n' || *start == '\r')
+               start++;
+
+       if (!*start) {
+               *String = '\0';
+               return;
+       }
+
+       /* ... and at the end: */
+       end = strchr(start, '\0');
+       end--;
+       while ((*end == ' ' || *end == '\t' || *end == '\n' || *end == '\r')
+              && end >= start)
+               end--;
+
+       /* New trailing NULL byte */
+       *(++end) = '\0';
+
+       memmove(String, start, (size_t)(end - start)+1);
 } /* ngt_TrimStr */
 
 
+/**
+ * Convert a string to uppercase letters.
+ */
 GLOBAL char *
-ngt_LowerStr( char *String )
+ngt_UpperStr(char *String)
 {
-       /* String in Kleinbuchstaben konvertieren. Der uebergebene
-        * Speicherbereich wird durch das Ergebnis ersetzt, zusaetzlich
-        * wird dieser auch als Pointer geliefert. */
+       char *ptr;
 
+       assert(String != NULL);
+
+       ptr = String;
+       while(*ptr) {
+               *ptr = toupper(*ptr);
+               ptr++;
+       }
+       return String;
+} /* ngt_UpperStr */
+
+
+/**
+ * Convert a string to lowercase letters.
+ */
+GLOBAL char *
+ngt_LowerStr(char *String)
+{
        char *ptr;
 
-       assert( String != NULL );
+       assert(String != NULL);
 
-       /* Zeichen konvertieren */
        ptr = String;
-       while( *ptr )
-       {
-               *ptr = tolower( *ptr );
+       while(*ptr) {
+               *ptr = tolower(*ptr);
                ptr++;
        }
-       
        return String;
 } /* ngt_LowerStr */
 
@@ -92,5 +119,4 @@ ngt_TrimLastChr( char *String, const char Chr)
        if( String[len] == Chr ) String[len] = '\0';
 } /* ngt_TrimLastChr */
 
-
 /* -eof- */