* Trace file using lprintf() similarly to citserver

[citadel.git] / webcit / tools.c

diff --git a/webcit/tools.c b/webcit/tools.c
index 9216105fc4269073e708964272a1f91532bab2c9..8bcccaed682a696b5d1703abd6ebec47cc741bdf 100644 (file)
--- a/webcit/tools.c
+++ b/webcit/tools.c
@@ -25,14 +25,23 @@
 #include <signal.h>
 #include <sys/time.h>
 #include "webcit.h"
+#include "webserver.h"
 
 
+char *ascmonths[] = {
+       "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+       "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
+
+char *ascdays[] = {
+       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+};
 
 
 char *safestrncpy(char *dest, const char *src, size_t n)
 {
        if (dest == NULL || src == NULL) {
-               fprintf(stderr, "safestrncpy: NULL argument\n");
+               lprintf(1, "safestrncpy: NULL argument\n");
                abort();
        }
        strncpy(dest, src, n);
@@ -41,68 +50,101 @@ char *safestrncpy(char *dest, const char *src, size_t n)
 }
 
 
+
 /*
- * num_parms()  -  discover number of parameters...
+ * num_tokens()  -  discover number of parameters/tokens in a string
  */
-int num_parms(char *source)
-{
+int num_tokens(char *source, char tok) {
        int a;
        int count = 1;
 
-       for (a = 0; a < strlen(source); ++a)
-               if (source[a] == '|')
-                       ++count;
-       return (count);
+       if (source == NULL) return(0);
+       for (a=0; a<strlen(source); ++a) {
+               if (source[a]==tok) ++count;
+       }
+       return(count);
 }
 
 /*
- * extract()  -  extract a parameter from a series of "|" separated...
+ * extract_token()  -  a smarter string tokenizer
  */
-void extract(char *dest, char *source, int parmnum)
+void extract_token(char *dest, char *source, int parmnum, char separator) 
 {
-       char buf[256];
-       int count = 0;
-       int n;
+       int i;
+       int len;
+       int curr_parm;
 
-       if (strlen(source) == 0) {
-               strcpy(dest, "");
-               return;
-       }
-       n = num_parms(source);
+       strcpy(dest,"");
+       len = 0;
+       curr_parm = 0;
 
-       if (parmnum >= n) {
-               strcpy(dest, "");
+       if (strlen(source)==0) {
                return;
+               }
+
+       for (i=0; i<strlen(source); ++i) {
+               if (source[i]==separator) {
+                       ++curr_parm;
+               }
+               else if (curr_parm == parmnum) {
+                       dest[len+1] = 0;
+                       dest[len++] = source[i];
+               }
        }
-       strcpy(buf, source);
-       if ((parmnum == 0) && (n == 1)) {
-               strcpy(dest, buf);
-               for (n = 0; n < strlen(dest); ++n)
-                       if (dest[n] == '|')
-                               dest[n] = 0;
+}
+
+
+
+/*
+ * remove_token()  -  a tokenizer that kills, maims, and destroys
+ */
+void remove_token(char *source, int parmnum, char separator)
+{
+       int i;
+       int len;
+       int curr_parm;
+       int start, end;
+
+       len = 0;
+       curr_parm = 0;
+       start = (-1);
+       end = (-1);
+
+       if (strlen(source)==0) {
                return;
+               }
+
+       for (i=0; i<strlen(source); ++i) {
+               if ( (start < 0) && (curr_parm == parmnum) ) {
+                       start = i;
+               }
+
+               if ( (end < 0) && (curr_parm == (parmnum+1)) ) {
+                       end = i;
+               }
+
+               if (source[i]==separator) {
+                       ++curr_parm;
+               }
        }
-       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);
+
+       if (end < 0) end = strlen(source);
+
+       strcpy(&source[start], &source[end]);
 }
 
+
+
+
 /*
  * 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));
+       char buf[SIZ];
+       
+       extract_token(buf, source, parmnum, '|');
+       return(atoi(buf));
 }
 
 /*
@@ -110,13 +152,26 @@ int extract_int(char *source, int parmnum)
  */
 long extract_long(char *source, long int parmnum)
 {
-       char buf[256];
-
-       extract(buf, source, parmnum);
-       return (atol(buf));
+       char buf[SIZ];
+       
+       extract_token(buf, source, parmnum, '|');
+       return(atol(buf));
 }
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*
  * check for the presence of a character within a string (returns count)
  */
@@ -139,11 +194,6 @@ char ch;
 void fmt_date(char *buf, time_t thetime) {
        struct tm *tm;
 
-       char *ascmonths[] = {
-               "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-               "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-       };
-
        strcpy(buf, "");
        tm = localtime(&thetime);
 
@@ -156,3 +206,60 @@ void fmt_date(char *buf, time_t thetime) {
                ( (tm->tm_hour > 12) ? "pm" : "am" )
        );
 }
+
+
+
+
+/*
+ * Format a date/time stamp to the format used in HTTP headers
+ */
+void httpdate(char *buf, time_t thetime) {
+       struct tm *tm;
+
+       strcpy(buf, "");
+       tm = localtime(&thetime);
+
+       sprintf(buf, "%s, %02d %s %4d %02d:%02d:%02d",
+               ascdays[tm->tm_wday],
+               tm->tm_mday,
+               ascmonths[tm->tm_mon],
+               tm->tm_year + 1900,
+               tm->tm_hour,
+               tm->tm_min,
+               tm->tm_sec
+       );
+}
+
+
+
+
+
+/*
+ * Utility function to "readline" from memory
+ * (returns new pointer)
+ */
+char *memreadline(char *start, char *buf, int maxlen)
+{
+        char ch;
+        char *ptr;
+        int len = 0;    /* tally our own length to avoid strlen() delays */
+
+        ptr = start;
+        memset(buf, 0, maxlen);
+
+        while (1) {
+                ch = *ptr++;
+                if ( (len < (maxlen - 1)) && (ch != 13) && (ch != 10) ) {
+                        buf[strlen(buf) + 1] = 0;
+                        buf[strlen(buf)] = ch;
+                        ++len;
+                }
+                if ((ch == 10) || (ch == 0)) {
+                        return ptr;
+                }
+        }
+}
+
+
+
+