Replaced extract_token() with a completely new

[citadel.git] / webcit / tools.c

diff --git a/webcit/tools.c b/webcit/tools.c
index 0a0718381d7ae3d388ea1c6fdb7ac45b8d2d0669..f83a7d863bf60360d99fef3fe986a869b48a1909 100644 (file)
--- a/webcit/tools.c
+++ b/webcit/tools.c
@@ -45,58 +45,61 @@ char *safestrncpy(char *dest, const char *src, size_t n)
  */
 int num_tokens(char *source, char tok)
 {
-       int a = 0;
        int count = 1;
+       char *ptr = source;
 
-       if (source == NULL)
+       if (source == NULL) {
                return (0);
-       for (a = 0; a < strlen(source); ++a) {
-               if (source[a] == tok)
+       }
+
+       while (*ptr != '\0') {
+               if (*ptr++ == tok) {
                        ++count;
+               }
        }
+       
        return (count);
 }
 
-/**
- * brief a string tokenizer
- * \param dest destination string 
- * \param source the string to grab tokens from
- * \param parmnum the n'th token to grab
- * \param separator the tokenizer string
- * \param maxlen the length of dest
+/*
+ * extract_token() - a string tokenizer
+ * returns -1 if not found, or length of token.
  */
-void extract_token(char *dest, const char *source, int parmnum, char separator, int maxlen)
+long extract_token(char *dest, const char *source, int parmnum, char separator, int maxlen)
 {
-       char *d;                /* dest */
-       const char *s;          /* source */
-       int count = 0;
-       int len = 0;
+       const char *s;                  /* source */
+       int len = 0;                    /* running total length of extracted string */
+       int current_token = 0;          /* token currently being processed */
+
+       s = source;
+
+       if (dest == NULL) {
+               return(-1);
+       }
 
        dest[0] = 0;
 
-       /* Locate desired parameter */
-       s = source;
-       while (count < parmnum) {
-               /* End of string, bail! */
-               if (!*s) {
-                       s = NULL;
-                       break;
-               }
+       if (s == NULL) {
+               return(-1);
+       }
+
+       while (*s) {
                if (*s == separator) {
-                       count++;
+                       ++current_token;
                }
-               s++;
+               else if ( (current_token == parmnum) && (len < maxlen) ) {
+                       dest[len] = *s;
+                       ++len;
+               }
+               ++s;
        }
-       if (!s) return;         /* Parameter not found */
 
-       for (d = dest; *s && *s != separator && ++len<maxlen; s++, d++) {
-               *d = *s;
-       }
-       *d = 0;
+       dest[len] = 0;
+       if (current_token < parmnum) return(-1);
+       return(len);
 }
 
 
-
 /**
  * \brief a tokenizer that kills, maims, and destroys
  * \param source the string to process
@@ -106,7 +109,7 @@ void extract_token(char *dest, const char *source, int parmnum, char separator,
 void remove_token(char *source, int parmnum, char separator)
 {
        int i;
-       int len;
+       int len, slen;
        int curr_parm;
        int start, end;
 
@@ -115,11 +118,14 @@ void remove_token(char *source, int parmnum, char separator)
        start = (-1);
        end = (-1);
 
-       if (strlen(source) == 0) {
+       slen = strlen(source);
+       if (slen == 0) {
                return;
        }
 
-       for (i = 0; i < strlen(source); ++i) {
+       for (i = 0; 
+            ( (i < slen)  && (end == -1) ); 
+            ++i) {
                if ((start < 0) && (curr_parm == parmnum)) {
                        start = i;
                }
@@ -134,9 +140,9 @@ void remove_token(char *source, int parmnum, char separator)
        }
 
        if (end < 0)
-               end = strlen(source);
+               end = slen;
 
-       strcpy(&source[start], &source[end]);
+       memmove(&source[start], &source[end], slen - end + 1);
 }
 
 
@@ -183,9 +189,10 @@ long extract_long(const char *source, int parmnum)
  */
 int haschar(char *st,char ch)
 {
-       int a, b;
+       int a, b, len;
        b = 0;
-       for (a = 0; a < strlen(st); ++a)
+       len = strlen(st);
+       for (a = 0; a < len; ++a)
                if (st[a] == ch)
                        ++b;
        return (b);
@@ -210,10 +217,9 @@ char *memreadline(char *start, char *buf, int maxlen)
 
        while (1) {
                ch = *ptr++;
-               if ((len < (maxlen - 1)) && (ch != 13) && (ch != 10)) {
-                       buf[strlen(buf) + 1] = 0;
-                       buf[strlen(buf)] = ch;
-                       ++len;
+               if ((len + 1 < (maxlen)) && (ch != 13) && (ch != 10)) {
+                       buf[len++] = ch;
+                       buf[len] = 0;
                }
                if ((ch == 10) || (ch == 0)) {
                        return ptr;
@@ -232,26 +238,47 @@ char *memreadline(char *start, char *buf, int maxlen)
 int pattern2(char *search, char *patn)
 {
        int a;
-       for (a = 0; a < strlen(search); ++a) {
-               if (!strncasecmp(&search[a], patn, strlen(patn)))
+       int len, plen;
+       len = strlen (search);
+       plen = strlen (patn);
+       for (a = 0; a < len; ++a) {
+               if (!strncasecmp(&search[a], patn, plen))
                        return (a);
        }
        return (-1);
 }
 
 
+/**
+ * \brief Strip leading and trailing spaces from a string; with premeasured and adjusted length.
+ * \param buf the string to modify
+ * \param len length of the string. 
+ */
+void stripltlen(char *buf, int *len)
+{
+       int delta = 0;
+       if (*len == 0) return;
+       while ((*len > delta) && (isspace(buf[delta]))){
+               delta ++;
+       }
+       memmove (buf, &buf[delta], *len - delta + 1);
+       (*len) -=delta;
+
+       if (*len == 0) return;
+       while (isspace(buf[(*len) - 1])){
+               buf[--(*len)] = '\0';
+       }
+}
+
 /**
  * \brief Strip leading and trailing spaces from a string
  * \param buf the string to modify
  */
 void striplt(char *buf)
 {
-       if (strlen(buf) == 0) return;
-       while ((strlen(buf) > 0) && (isspace(buf[0])))
-               strcpy(buf, &buf[1]);
-       if (strlen(buf) == 0) return;
-       while (isspace(buf[strlen(buf) - 1]))
-               buf[strlen(buf) - 1] = 0;
+       int len;
+       len = strlen(buf);
+       stripltlen(buf, &len);
 }
 
 
@@ -313,12 +340,13 @@ void stripout(char *str, char leftboundary, char rightboundary)
        int a;
        int lb = (-1);
        int rb = (-1);
+       int len = strlen(str);
 
        do {
                lb = (-1);
                rb = (-1);
 
-               for (a = 0; a < strlen(str); ++a) {
+               for (a = 0; a < len; ++a) {
                        if (str[a] == leftboundary)
                                lb = a;
                        if (str[a] == rightboundary)
@@ -326,7 +354,8 @@ void stripout(char *str, char leftboundary, char rightboundary)
                }
 
                if ((lb > 0) && (rb > lb)) {
-                       strcpy(&str[lb - 1], &str[rb + 1]);
+                       memmove(&str[lb - 1], &str[rb + 1], len - rb);
+                       len -= (rb - lb + 2);
                }
 
        } while ((lb > 0) && (rb > lb));
@@ -359,7 +388,7 @@ void sleeeeeeeeeep(int seconds)
  * \param sourcelen the length of the source data (may contain string terminators)
  */
 
-void CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen)
+void CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int linebreaks)
 {
        int i, hiteof = FALSE;
        int spos = 0;
@@ -418,7 +447,7 @@ void CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen)
                                dest[dpos] = 0;
                        }
                        thisline += 4;
-                       if (thisline > 70) {
+                       if ( (linebreaks) && (thisline > 70) ) {
                                dest[dpos++] = '\r';
                                dest[dpos++] = '\n';
                                dest[dpos] = 0;
@@ -426,7 +455,7 @@ void CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen)
                        }
                }
        }
-       if (thisline > 70) {
+       if ( (linebreaks) && (thisline > 70) ) {
                dest[dpos++] = '\r';
                dest[dpos++] = '\n';
                dest[dpos] = 0;
@@ -516,10 +545,10 @@ int CtdlDecodeBase64(char *dest, const char *source, size_t length)
 void generate_uuid(char *buf) {
        static int seq = 0;
 
-       sprintf(buf, "%s-%lx-%x-%x",
+       sprintf(buf, "%s-%lx-%lx-%x",
                serv_info.serv_nodename,
                (long)time(NULL),
-               getpid(),
+               (long)getpid(),
                (seq++)
        );
 }