- port to Cygwin (DLL support, etc.)

[citadel.git] / citadel / support.c

diff --git a/citadel/support.c b/citadel/support.c
index 455a99d9ba7339dc8e2e34ebe9e7cb555aad5ce5..3262890b2cabec271475df30acbd6b45a5c5b1e5 100644 (file)
--- a/citadel/support.c
+++ b/citadel/support.c
@@ -1,12 +1,23 @@
+/*
+ * $Id$
+ *
+ * Server-side utility functions
+ *
+ */
+
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <pthread.h>
 #include "citadel.h"
 #include "server.h"
-#include "proto.h"
+#include "support.h"
 
 
 /*
@@ -16,6 +27,7 @@ void strproc(char *string)
 {
        int a;
 
+       if (string == NULL) return;
        if (strlen(string)==0) return;
 
        /* Convert non-printable characters to blanks */
@@ -52,80 +64,6 @@ void strproc(char *string)
 
 
 
-/*
- * num_parms()  -  discover number of parameters...
- */
-int num_parms(char *source)
-{
-       int a;
-       int count = 1;
-
-       for (a=0; a<strlen(source); ++a) 
-               if (source[a]=='|') ++count;
-       return(count);
-       }
-
-/*
- * extract()  -  extract a parameter from a series of "|" separated...
- */
-void extract(char *dest, char *source, int parmnum)
-{
-       char buf[256];
-       int count = 0;
-       int n;
-
-       if (strlen(source)==0) {
-               strcpy(dest,"");
-               return;
-               }
-
-       n = num_parms(source);
-
-       if (parmnum >= n) {
-               strcpy(dest,"");
-               return;
-               }
-       strcpy(buf,source);
-       if ( (parmnum == 0) && (n == 1) ) {
-               strcpy(dest,buf);
-               for (n=0; n<strlen(dest); ++n)
-                       if (dest[n]=='|') dest[n] = 0;
-               return;
-               }
-
-       while (count++ < parmnum) do {
-               strcpy(buf,&buf[1]);
-               } while( (strlen(buf)>0) && (buf[0]!='|') );
-       if (buf[0]=='|') strcpy(buf,&buf[1]);
-       for (count = 0; count<strlen(buf); ++count)
-               if (buf[count] == '|') buf[count] = 0;
-       strcpy(dest,buf);
-       }
-
-/*
- * extract_int()  -  extract an int parm w/o supplying a buffer
- */
-int extract_int(char *source, int parmnum)
-{
-       char buf[256];
-       
-       extract(buf,source,parmnum);
-       return(atoi(buf));
-       }
-
-/*
- * extract_long()  -  extract an long parm w/o supplying a buffer
- */
-long extract_long(char *source, long int parmnum)
-{
-       char buf[256];
-       
-       extract(buf,source,parmnum);
-       return(atol(buf));
-       }
-
-
-
 /*
  * get a line of text from a file
  * ignores lines starting with #
@@ -169,14 +107,14 @@ int pattern2(char *search, char *patn)
 void mesg_locate(char *targ, char *searchfor, int numdirs, char **dirs)
 {
        int a;
-       char buf[256];
+       char buf[SIZ];
        FILE *ls;
 
        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(fgets(buf,sizeof buf,ls)!=NULL) {
                                while (isspace(buf[strlen(buf)-1]))
                                        buf[strlen(buf)-1] = 0;
                                if (!strcasecmp(buf,searchfor)) {
@@ -192,12 +130,12 @@ void mesg_locate(char *targ, char *searchfor, int numdirs, char **dirs)
        }
 
 
-#ifdef NO_STRERROR
+#ifndef HAVE_STRERROR
 /*
  * replacement strerror() for systems that don't have it
  */
-char *strerror(e)
-int e; {
+char *strerror(int e)
+{
        static char buf[32];
 
        sprintf(buf,"errno = %d",e);