fix ngt_TrimStr(), fix format string

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

diff --git a/src/tool/tool.c b/src/tool/tool.c
index 3b66d7f8315634614a867c3ac16db3949d8784ce..27051ced632cdc5e8280bb11f35c37a79b059082 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,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 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,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: tool.c,v 1.1 2003/01/13 12:20:16 alex Exp $";
+static char UNUSED id[] = "$Id: tool.c,v 1.5 2006/03/24 23:25:39 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -26,39 +26,49 @@ static char UNUSED id[] = "$Id: tool.c,v 1.1 2003/01/13 12:20:16 alex Exp $";
 #include "tool.h"
 
 
-GLOBAL VOID
-ngt_TrimStr( CHAR *String )
+/**
+ * Removes all leading and trailing whitespaces of a string.
+ * @param String The string to remove whitespaces from.
+ */
+GLOBAL void
+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++;
+
+       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 */
 
 
-GLOBAL CHAR *
-ngt_LowerStr( CHAR *String )
+GLOBAL char *
+ngt_LowerStr( char *String )
 {
        /* String in Kleinbuchstaben konvertieren. Der uebergebene
         * Speicherbereich wird durch das Ergebnis ersetzt, zusaetzlich
         * wird dieser auch als Pointer geliefert. */
 
-       CHAR *ptr;
+       char *ptr;
 
        assert( String != NULL );
 
@@ -74,4 +84,23 @@ ngt_LowerStr( CHAR *String )
 } /* ngt_LowerStr */
 
 
+GLOBAL void
+ngt_TrimLastChr( char *String, const char Chr)
+{
+       /* If last character in the string matches Chr, remove it.
+        * Empty strings are handled correctly. */
+
+        unsigned int len;
+
+       assert( String != NULL );
+
+       len = strlen( String );
+       if( len == 0 ) return;
+
+       len--;
+
+       if( String[len] == Chr ) String[len] = '\0';
+} /* ngt_TrimLastChr */
+
+
 /* -eof- */