* The size constant "256" which shows up everywhere as a buffer size has now

[citadel.git] / citadel / tools.c

diff --git a/citadel/tools.c b/citadel/tools.c
index 052122e6607d1461ff14bd5e616fbe7bb5701646..4a5ee52c7a9d66d7bfc55e4cf97dbb80c80b16c0 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -1,13 +1,18 @@
 /*
- * tools.c -- Miscellaneous routines used by both the client and server.
  * $Id$
+ *
+ * Utility functions that are used by both the client and server.
+ *
  */
 
+#include "sysdep.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
+#include <sys/time.h>
 #include "tools.h"
+#include "citadel.h"
 
 #define TRUE  1
 #define FALSE 0
@@ -18,34 +23,53 @@ static byte dtable[256];          /* base64 encode / decode table */
 
 char *safestrncpy(char *dest, const char *src, size_t n)
 {
-  if (dest == NULL || src == NULL)
-    {
-      fprintf(stderr, "safestrncpy: NULL argument\n");
-      abort();
-    }
-  strncpy(dest, src, n);
-  dest[n - 1] = 0;
-  return dest;
+       if (dest == NULL || src == NULL) {
+               fprintf(stderr, "safestrncpy: NULL argument\n");
+               abort();
+       }
+       strncpy(dest, src, n);
+       dest[n - 1] = 0;
+       return dest;
+}
+
+
+
+#ifndef HAVE_STRNCASECMP
+int strncasecmp(char *lstr, char *rstr, int len)
+{
+       int pos = 0;
+       char lc,rc;
+       while (pos<len) {
+               lc=tolower(lstr[pos]);
+               rc=tolower(rstr[pos]);
+               if ((lc==0)&&(rc==0)) return(0);
+               if (lc<rc) return(-1);
+               if (lc>rc) return(1);
+               pos=pos+1;
+       }
+       return(0);
 }
+#endif
+
 
 
 /*
- * 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;
+       for (a=0; a<strlen(source); ++a) {
+               if (source[a]==tok) ++count;
+       }
        return(count);
 }
 
 /*
- * extract()  -  a smarter string tokenizer
+ * extract_token()  -  a smarter string tokenizer
  */
-void extract_token(char *dest, char *source, int parmnum, char separator)
+void extract_token(char *dest, char *source, int parmnum, char separator) 
 {
        int i;
        int len;
@@ -70,12 +94,57 @@ void extract_token(char *dest, char *source, int parmnum, char separator)
        }
 }
 
+
+
+/*
+ * 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;
+               }
+       }
+
+       if (end < 0) end = strlen(source);
+
+       printf("%d .. %d\n", start, end);
+
+       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];
+       char buf[SIZ];
        
        extract_token(buf, source, parmnum, '|');
        return(atoi(buf));
@@ -86,7 +155,7 @@ int extract_int(char *source, int parmnum)
  */
 long extract_long(char *source, long int parmnum)
 {
-       char buf[256];
+       char buf[SIZ];
        
        extract_token(buf, source, parmnum, '|');
        return(atol(buf));
@@ -223,9 +292,9 @@ void decode_base64(char *dest, char *source)
  */
 void striplt(char *buf)
 {
-        while ((strlen(buf) > 0) && (buf[0] == 32))
+        while ((strlen(buf) > 0) && (isspace(buf[0])))
                 strcpy(buf, &buf[1]);
-        while (buf[strlen(buf) - 1] == 32)
+        while (isspace(buf[strlen(buf) - 1]))
                 buf[strlen(buf) - 1] = 0;
 }
 
@@ -254,19 +323,27 @@ int haschar(char *st, int ch)
  */
 int collapsed_strcmp(char *s1, char *s2) {
        char *c1, *c2;
-       int i, ret;
-
-       c1 = strdup(s1);
-       c2 = strdup(s2);
-
-       for (i=0; i<strlen(c1); ++i) {
-               while (!isalnum(c1[i])) strcpy(&c1[i], &c1[i+1]);
-               if (isupper(c1[i])) c1[i]=tolower(c1[i]);
+       int i, ret, pos;
+
+       c1 = malloc(strlen(s1)+1);
+       c2 = malloc(strlen(s2)+1);
+       c1[0] = 0;
+       c2[0] = 0;
+
+       pos = 0;
+       for (i=0; i<strlen(s1); ++i) {
+               if (isalnum(s1[i])) {
+                       c1[pos] = tolower(s1[i]);
+                       c1[++pos] = 0;
+               }
        }
 
-       for (i=0; i<strlen(c2); ++i) {
-               while (!isalnum(c2[i])) strcpy(&c2[i], &c2[i+1]);
-               if (isupper(c2[i])) c2[i]=tolower(c2[i]);
+       pos = 0;
+       for (i=0; i<strlen(s2); ++i) {
+               if (isalnum(s2[i])) {
+                       c2[pos] = tolower(s2[i]);
+                       c2[++pos] = 0;
+               }
        }
 
        ret = strcmp(c1, c2);
@@ -274,3 +351,40 @@ int collapsed_strcmp(char *s1, char *s2) {
        free(c2);
        return(ret);
 }
+
+
+
+/*
+ * Format a date/time stamp for output 
+ */
+void fmt_date(char *buf, time_t thetime) {
+       struct tm *tm;
+       int hour;
+
+       char *ascmonths[] = {
+               "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+               "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+       };
+
+       strcpy(buf, "");
+       tm = localtime(&thetime);
+
+       hour = tm->tm_hour;
+       if (hour == 0)  hour = 12;
+       else if (hour > 12) hour = hour - 12;
+
+       sprintf(buf, "%s %d %4d %d:%02d%s",
+               ascmonths[tm->tm_mon],
+               tm->tm_mday,
+               tm->tm_year + 1900,
+               hour,
+               tm->tm_min,
+               ( (tm->tm_hour >= 12) ? "pm" : "am" )
+       );
+}
+
+
+
+
+
+