Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / support.c

diff --git a/citadel/support.c b/citadel/support.c
index cc4ac677b38d87577225bc4ce960296dda3b6bae..16e10e6f8e38f25ca4ba5583bdd83393f0ccc61d 100644 (file)
--- a/citadel/support.c
+++ b/citadel/support.c
@@ -1,56 +1,62 @@
-/* $Id$ */
+/*
+ * Server-side utility functions
+ */
+
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <libcitadel.h>
+
 #include "citadel.h"
-#include "server.h"
 #include "support.h"
 
-
 /*
  * strproc()  -  make a string 'nice'
  */
 void strproc(char *string)
 {
-       int a;
+       int a, b;
 
-       if (strlen(string)==0) return;
+       if (string == NULL) 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;
-               }
+       }
 
+       /* a is now the length of our string. */
        /* Remove leading and trailing blanks */
-       while( (string[0]<33) && (strlen(string)>0) )
-               strcpy(string,&string[1]);
-       while( (string[strlen(string)-1]<33) && (strlen(string)>0) )
-               string[strlen(string)-1]=0;
+       while( (string[a-1]<33) && (!IsEmptyStr(string)) )
+               string[--a]=0;
+       b = 0;
+       while( (string[b]<33) && (!IsEmptyStr(&string[b])) )
+               b++;
+       if (b > 0)
+               memmove(string,&string[b], a - b + 1);
 
        /* 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]);
-               }
-
        }
 
+}
+
 
 
 /*
@@ -74,49 +80,30 @@ int getstring(FILE *fp, char *string)
                        string[a-1]=0;
                } while(string[0]=='#');
        return(strlen(string));
-       }
+}
 
 
-/*
- * pattern2()  -  searches for patn within search string, returns pos 
- */ 
-int pattern2(char *search, char *patn)
-{
-       int a;
-       for (a=0; a<strlen(search); ++a) {
-               if (!strncasecmp(&search[a],patn,strlen(patn))) return(a);
-               }
-       return(-1);
-       }
 
 
 /*
  * mesg_locate()  -  locate a message or help file, case insensitive
  */
-void mesg_locate(char *targ, char *searchfor, int numdirs, char **dirs)
+void mesg_locate(char *targ, size_t n, const char *searchfor,
+                int numdirs, const char * const *dirs)
 {
        int a;
-       char buf[256];
-       FILE *ls;
+       char buf[SIZ];
+       struct stat test;
 
        for (a=0; a<numdirs; ++a) {
-               sprintf(buf,"cd %s; exec ls",dirs[a]);
-               ls = (FILE *) popen(buf,"r");
-               if (ls != NULL) {
-                       while(fgets(buf,255,ls)!=NULL) {
-                               while (isspace(buf[strlen(buf)-1]))
-                                       buf[strlen(buf)-1] = 0;
-                               if (!strcasecmp(buf,searchfor)) {
-                                       pclose(ls);
-                                       sprintf(targ,"%s/%s",dirs[a],buf);
-                                       return;
-                                       }
-                               }
-                       pclose(ls);
-                       }
+               snprintf(buf, sizeof buf, "%s/%s", dirs[a], searchfor);
+               if (!stat(buf, &test)) {
+                       snprintf(targ, n, "%s/%s", dirs[a], searchfor);
+                       return;
                }
-       strcpy(targ,"");
        }
+       strcpy(targ,"");
+}
 
 
 #ifndef HAVE_STRERROR
@@ -127,7 +114,7 @@ char *strerror(int e)
 {
        static char buf[32];
 
-       sprintf(buf,"errno = %d",e);
+       snprintf(buf,sizeof buf,"errno = %d",e);
        return(buf);
        }
 #endif