* strlen holy war: loops. in loops it's very evil. the easy ones go away now.

[citadel.git] / citadel / support.c

diff --git a/citadel/support.c b/citadel/support.c
index 855c9ad4c3712fb596c51bc474592534f98fcbf5..a3ebffc19142e7bb6d52288160b0011f25df099d 100644 (file)
--- a/citadel/support.c
+++ b/citadel/support.c
@@ -5,10 +5,6 @@
  *
  */
 
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
 #include "sysdep.h"
 #include <stdlib.h>
 #include <sys/types.h>
@@ -20,7 +16,7 @@
 #include "citadel.h"
 #include "server.h"
 #include "support.h"
-
+#include "tools.h"
 
 /*
  * strproc()  -  make a string 'nice'
@@ -30,40 +26,40 @@ void strproc(char *string)
        int a;
 
        if (string == NULL) return;
-       if (strlen(string)==0) return;
+       if (IsEmptyStr(string)) return;
 
        /* Convert non-printable characters to blanks */
-       for (a=0; a<strlen(string); ++a) {
+       for (a=0; !IsEmptyStr(&string[a]); ++a) {
                if (string[a]<32) string[a]=32;
                if (string[a]>126) string[a]=32;
-               }
+       }
 
        /* Remove leading and trailing blanks */
-       while( (string[0]<33) && (strlen(string)>0) )
+       while( (string[0]<33) && (!IsEmptyStr(string)) )
                strcpy(string,&string[1]);
-       while( (string[strlen(string)-1]<33) && (strlen(string)>0) )
+       while( (string[strlen(string)-1]<33) && (!IsEmptyStr(string)) )
                string[strlen(string)-1]=0;
 
        /* Remove double blanks */
-       for (a=0; a<strlen(string); ++a) {
+       for (a=0; !IsEmptyStr(&string[a]); ++a) {
                if ((string[a]==32)&&(string[a+1]==32)) {
                        strcpy(&string[a],&string[a+1]);
                        a=0;
-                       }
                }
+       }
 
        /* remove characters which would interfere with the network */
-       for (a=0; a<strlen(string); ++a) {
+       for (a=0; !IsEmptyStr(&string[a]); ++a) {
                while (string[a]=='!') strcpy(&string[a],&string[a+1]);
                while (string[a]=='@') strcpy(&string[a],&string[a+1]);
                while (string[a]=='_') strcpy(&string[a],&string[a+1]);
                while (string[a]==',') strcpy(&string[a],&string[a+1]);
                while (string[a]=='%') strcpy(&string[a],&string[a+1]);
                while (string[a]=='|') strcpy(&string[a],&string[a+1]);
-               }
-
        }
 
+}
+
 
 
 /*
@@ -87,7 +83,7 @@ int getstring(FILE *fp, char *string)
                        string[a-1]=0;
                } while(string[0]=='#');
        return(strlen(string));
-       }
+}
 
 
 /*
@@ -95,9 +91,11 @@ int getstring(FILE *fp, char *string)
  */ 
 int pattern2(char *search, char *patn)
 {
-       int a;
-       for (a=0; a<strlen(search); ++a) {
-               if (!strncasecmp(&search[a],patn,strlen(patn))) return(a);
+       int a, len;
+       
+       len = strlen(patn);
+       for (a=0; !IsEmptyStr(&search[a]); ++a) {
+               if (!strncasecmp(&search[a],patn, len)) return(a);
                }
        return(-1);
        }
@@ -112,12 +110,11 @@ void mesg_locate(char *targ, size_t n, const char *searchfor,
        int a;
        char buf[SIZ];
        struct stat test;
-       FILE *ls;
 
        for (a=0; a<numdirs; ++a) {
                snprintf(buf, sizeof buf, "%s/%s", dirs[a], searchfor);
                if (!stat(buf, &test)) {
-                       snprintf(targ,n,"%s/%s", dirs[a], searchfor);
+                       snprintf(targ, n, "%s/%s", dirs[a], searchfor);
                        return;
                }
        }