* 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 5955db8b936c50f627bba61c17a78df68f44c5ae..4a5ee52c7a9d66d7bfc55e4cf97dbb80c80b16c0 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -1,14 +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
@@ -19,15 +23,34 @@ 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
+
 
 
 /*
@@ -121,7 +144,7 @@ void remove_token(char *source, int parmnum, char separator)
  */
 int extract_int(char *source, int parmnum)
 {
-       char buf[256];
+       char buf[SIZ];
        
        extract_token(buf, source, parmnum, '|');
        return(atoi(buf));
@@ -132,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));
@@ -269,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;
 }
 
@@ -336,6 +359,7 @@ int collapsed_strcmp(char *s1, char *s2) {
  */
 void fmt_date(char *buf, time_t thetime) {
        struct tm *tm;
+       int hour;
 
        char *ascmonths[] = {
                "Jan", "Feb", "Mar", "Apr", "May", "Jun",
@@ -345,13 +369,17 @@ void fmt_date(char *buf, time_t thetime) {
        strcpy(buf, "");
        tm = localtime(&thetime);
 
-       sprintf(buf, "%s %d %d %d:%02d%s",
+       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,
-               ( (tm->tm_hour > 12) ? (tm->tm_hour - 12) : (tm->tm_hour) ),
+               hour,
                tm->tm_min,
-               ( (tm->tm_hour > 12) ? "pm" : "am" )
+               ( (tm->tm_hour >= 12) ? "pm" : "am" )
        );
 }