Mac OS X: fix test for packagemaker(1) tool in Makefile

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

diff --git a/src/tool/tool.c b/src/tool/tool.c
index 52d7be88e090dc7c149a168a6da6fe6a3b8d7c0c..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,8 +14,6 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: tool.c,v 1.8 2007/11/25 18:42:38 fw Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <ctype.h>
@@ -65,25 +63,40 @@ ngt_TrimStr(char *String)
 } /* 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 */
 
@@ -106,23 +119,4 @@ ngt_TrimLastChr( char *String, const char Chr)
        if( String[len] == Chr ) String[len] = '\0';
 } /* ngt_TrimLastChr */
 
-
-GLOBAL bool
-ngt_IPStrToBin(const char *ip_str, struct in_addr *inaddr)
-{
-       /* AF is always AF_INET for now */
-#ifdef HAVE_INET_ATON
-       if (inet_aton(ip_str, inaddr) == 0)
-               return false;
-#else
-       inaddr->s_addr = inet_addr(ip_str);
-       if (inaddr->s_addr == (unsigned)-1)
-               return false;
-#endif
-       return true;
-}
-
-
-
-
 /* -eof- */