Assert that we don't always have a valid session.

[citadel.git] / citadel / support.c

diff --git a/citadel/support.c b/citadel/support.c
index a3ebffc19142e7bb6d52288160b0011f25df099d..16e10e6f8e38f25ca4ba5583bdd83393f0ccc61d 100644 (file)
--- a/citadel/support.c
+++ b/citadel/support.c
@@ -1,29 +1,22 @@
 /*
- * $Id$
- *
  * 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"
-#include "tools.h"
 
 /*
  * strproc()  -  make a string 'nice'
  */
 void strproc(char *string)
 {
-       int a;
+       int a, b;
 
        if (string == NULL) return;
        if (IsEmptyStr(string)) return;
@@ -34,11 +27,15 @@ void strproc(char *string)
                if (string[a]>126) string[a]=32;
        }
 
+       /* a is now the length of our string. */
        /* Remove leading and trailing blanks */
-       while( (string[0]<33) && (!IsEmptyStr(string)) )
-               strcpy(string,&string[1]);
-       while( (string[strlen(string)-1]<33) && (!IsEmptyStr(string)) )
-               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; !IsEmptyStr(&string[a]); ++a) {
@@ -86,19 +83,6 @@ int getstring(FILE *fp, char *string)
 }
 
 
-/*
- * pattern2()  -  searches for patn within search string, returns pos 
- */ 
-int pattern2(char *search, char *patn)
-{
-       int a, len;
-       
-       len = strlen(patn);
-       for (a=0; !IsEmptyStr(&search[a]); ++a) {
-               if (!strncasecmp(&search[a],patn, len)) return(a);
-               }
-       return(-1);
-       }
 
 
 /*