removed some debugs

[citadel.git] / citadel / support.c

diff --git a/citadel/support.c b/citadel/support.c
index 855c9ad4c3712fb596c51bc474592534f98fcbf5..20937f2b82305ad936c77e7722aac73639457631 100644 (file)
--- a/citadel/support.c
+++ b/citadel/support.c
@@ -1,77 +1,61 @@
-/*
- * $Id$
- *
- * Server-side utility functions
- *
- */
-
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
+// Server-side utility functions
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.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;
+// strproc()  -  make a string 'nice'
+void strproc(char *string) {
+       int a, b;
 
        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) {
+       // Convert non-printable characters to blanks
+       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) )
-               strcpy(string,&string[1]);
-       while( (string[strlen(string)-1]<33) && (strlen(string)>0) )
-               string[strlen(string)-1]=0;
+       }
 
-       /* Remove double blanks */
-       for (a=0; a<strlen(string); ++a) {
+       // a is now the length of our string.
+       // Remove leading and trailing blanks
+       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; !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) {
+       // remove characters which would interfere with the network
+       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]);
-               }
-
        }
 
+}
 
 
-/*
- * get a line of text from a file
- * ignores lines starting with #
- */
-int getstring(FILE *fp, char *string)
-{
+// get a line of text from a file
+// ignores lines starting with #
+int getstring(FILE *fp, char *string) {
        int a,c;
        do {
                strcpy(string,"");
@@ -87,54 +71,4 @@ 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, size_t n, const char *searchfor,
-                int numdirs, const char * const *dirs)
-{
-       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);
-                       return;
-               }
-       }
-       strcpy(targ,"");
 }
-
-
-#ifndef HAVE_STRERROR
-/*
- * replacement strerror() for systems that don't have it
- */
-char *strerror(int e)
-{
-       static char buf[32];
-
-       snprintf(buf,sizeof buf,"errno = %d",e);
-       return(buf);
-       }
-#endif
-