* Completed self-service list subscription via web.

[citadel.git] / citadel / tools.c

diff --git a/citadel/tools.c b/citadel/tools.c
index bb7e2a9ed9fb38fb346fcdb99849c159fabefbb6..3a457ae6efc072a71c87bfa325699e6049df0bd0 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -30,21 +30,6 @@
 #include "tools.h"
 #include "citadel.h"
 
-#ifdef CIT_CLIENT
-#include "screen.h"
-#else
-int err_printf(char *fmt, ...);
-int err_printf(char *fmt, ...)
-{
-       va_list ap;
-       int retval;
-       va_start(ap, fmt);
-       retval = fprintf(stderr, fmt, ap);
-       va_end(ap);
-       return retval;
-}
-#endif
-
 #define TRUE  1
 #define FALSE 0
 
@@ -55,7 +40,7 @@ static byte dtable[256];            /* base64 encode / decode table */
 char *safestrncpy(char *dest, const char *src, size_t n)
 {
        if (dest == NULL || src == NULL) {
-               err_printf("safestrncpy: NULL argument\n");
+               fprintf(stderr, "safestrncpy: NULL argument\n");
                abort();
        }
        strncpy(dest, src, n);
@@ -98,10 +83,41 @@ int num_tokens(char *source, char tok) {
        return(count);
 }
 
+
+/* extract_token_fast() - a smarter string tokenizer */
+void extract_token(char *dest, char *source, int parmnum, char separator)
+{
+       char *d, *s;            /* dest, source */
+       int count = 0;
+
+       strcpy(dest, "");
+
+       /* Locate desired parameter */
+       s = source;
+       while (count < parmnum) {
+               /* End of string, bail! */
+               if (!*s) {
+                       s = NULL;
+                       break;
+               }
+               if (*s == separator) {
+                       count++;
+               }
+               s++;
+       }
+       if (!s) return;         /* Parameter not found */
+
+       for (d = dest; *s && *s != separator; s++, d++) {
+               *d = *s;
+       }
+       *d = 0;
+}
+
+
 /*
  * extract_token()  -  a smarter string tokenizer
  */
-void extract_token(char *dest, char *source, int parmnum, char separator) 
+void extract_token_old(char *dest, char *source, int parmnum, char separator) 
 {
        int i;
        int len;
@@ -128,10 +144,53 @@ void extract_token(char *dest, char *source, int parmnum, char separator)
 
 
 
+/* remove_token_fast() - a tokenizer that kills, maims, and destroys fast */
+void remove_token(char *source, int parmnum, char separator)
+{
+       char *d, *s;            /* dest, source */
+       int count = 0;
+
+       /* Find desired parameter */
+       d = source;
+       while (count < parmnum) {
+               /* End of string, bail! */
+               if (!*d) {
+                       d = NULL;
+                       break;
+               }
+               if (*d == separator) {
+                       count++;
+               }
+               d++;
+       }
+       if (!d) return;         /* Parameter not found */
+
+       /* Find next parameter */
+       s = d;
+       while (*s && *s != separator) {
+               s++;
+       }
+
+       /* Hack and slash */
+       if (*s)
+               strcpy(d, ++s);
+       else if (d == source)
+               *d = 0;
+       else
+               *--d = 0;
+       /*
+       while (*s) {
+               *d++ = *s++;
+       }
+       *d = 0;
+       */
+}
+
+
 /*
  * remove_token()  -  a tokenizer that kills, maims, and destroys
  */
-void remove_token(char *source, int parmnum, char separator)
+void remove_token_old(char *source, int parmnum, char separator)
 {
        int i;
        int len;
@@ -340,7 +399,7 @@ void striplt(char *buf)
 /* 
  * Return the number of occurances of character ch in string st
  */ 
-int haschar(char *st, int ch)
+int haschar(const char *st, int ch)
 {
        int a, b;
        b = 0;
@@ -393,7 +452,7 @@ int collapsed_strcmp(char *s1, char *s2) {
  * Format a date/time stamp for output 
  * seconds is whether to print the seconds
  */
-void fmt_date(char *buf, time_t thetime, int seconds) {
+void fmt_date(char *buf, size_t n, time_t thetime, int seconds) {
        struct tm *tm;
        int hour;
 
@@ -410,7 +469,7 @@ void fmt_date(char *buf, time_t thetime, int seconds) {
        else if (hour > 12) hour = hour - 12;
 
        if (seconds) {
-               sprintf(buf, "%s %d %4d %d:%02d:%02d%s",
+               snprintf(buf, n, "%s %d %4d %d:%02d:%02d%s",
                        ascmonths[tm->tm_mon],
                        tm->tm_mday,
                        tm->tm_year + 1900,
@@ -420,7 +479,7 @@ void fmt_date(char *buf, time_t thetime, int seconds) {
                        ( (tm->tm_hour >= 12) ? "pm" : "am" )
                );
        } else {
-               sprintf(buf, "%s %d %4d %d:%02d%s",
+               snprintf(buf, n, "%s %d %4d %d:%02d%s",
                        ascmonths[tm->tm_mon],
                        tm->tm_mday,
                        tm->tm_year + 1900,
@@ -454,7 +513,7 @@ int is_msg_in_mset(char *mset, long msgnum) {
                if (num_tokens(setstr, ':') >= 2) {
                        extract_token(histr, setstr, 1, ':');
                        if (!strcmp(histr, "*")) {
-                               sprintf(histr, "%ld", LONG_MAX);
+                               snprintf(histr, sizeof histr, "%ld", LONG_MAX);
                        }
                } 
                else {
@@ -534,3 +593,44 @@ void stripallbut(char *str, char leftboundary, char rightboundary) {
        }
 
 }
+
+char *myfgets(char *s, int size, FILE *stream) {
+       char *ret = fgets(s, size, stream);
+       char *nl;
+
+       if (ret != NULL) {
+               nl = strchr(s, '\n');
+
+               if (nl != NULL)
+                       *nl = 0;
+       }
+
+       return ret;
+}
+
+/*
+ * Escape a string for feeding out as a URL.
+ * Output buffer must be big enough to handle escape expansion!
+ */
+void urlesc(char *outbuf, char *strbuf)
+{
+       int a, b, c;
+       char *ec = " #&;`'|*?-~<>^()[]{}$\\";
+
+       strcpy(outbuf, "");
+
+       for (a = 0; a < strlen(strbuf); ++a) {
+               c = 0;
+               for (b = 0; b < strlen(ec); ++b) {
+                       if (strbuf[a] == ec[b])
+                               c = 1;
+               }
+               b = strlen(outbuf);
+               if (c == 1)
+                       sprintf(&outbuf[b], "%%%02x", strbuf[a]);
+               else
+                       sprintf(&outbuf[b], "%c", strbuf[a]);
+       }
+}
+
+