* Fixed striplt() to only remove leading and trailing blanks, but no others. It...

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index b61247d0c0b0b064426eabfc07c2bf7404e4ab16..1b2eddd5f5a8c6162968135df19b2571530ab8d1 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -617,8 +617,11 @@ void cmd_user(char *cmdbuf)
        char username[256];
        int a;
 
+       CtdlLogPrintf(CTDL_DEBUG, "cmd_user(%s)\n", cmdbuf);
        extract_token(username, cmdbuf, 0, '|', sizeof username);
+       CtdlLogPrintf(CTDL_DEBUG, "username: %s\n", username);
        striplt(username);
+       CtdlLogPrintf(CTDL_DEBUG, "username: %s\n", username);
 
        a = CtdlLoginExistingUser(NULL, username);
        switch (a) {

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 0f4f6e2d19e6f8ff2fe69d2ff4b7fcdc7c8b6727..12be21c1c6c14dc90114a147b52910c385a9e2de 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -343,7 +343,7 @@ size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int li
 int CtdlDecodeBase64(char *dest, const char *source, size_t length);
 unsigned int decode_hex(char *Source);
 int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen);
-long striplt(char *);
+size_t striplt(char *);
 int haschar(const char *st, int ch);
 void remove_token(char *source, int parmnum, char separator);
 void fmt_date(char *buf, size_t n, time_t thetime, int seconds);

diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index 6cb0646ea17133bcdd42937eb4c2dd3f1a796908..14cf43ec969c8ec8aa16210cea2e0c5253150fae 100644 (file)
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -460,46 +460,37 @@ char *rfc2047encode(char *line, long length)
 /*
  * Strip leading and trailing spaces from a string
  */
-long striplt(char *buf)
-{
-       int CountTrail = 0;
-       int FromStart = 1;
-       char *aptr, *bptr;
+size_t striplt(char *buf) {
+       char *first_nonspace = NULL;
+       char *last_nonspace = NULL;
+       char *ptr;
+       size_t new_len = 0;
 
-       if ((buf==NULL) || (IsEmptyStr(buf)))
+       if (!buf) {
                return 0;
+       }
 
-       bptr = aptr = buf;
-
-       while (!IsEmptyStr(aptr)) {
-               if (isspace(*aptr)) {
-                       if (FromStart)
-                               aptr ++;
-                       else {
-                               CountTrail ++;
-                               *bptr = *aptr;
-                               aptr++; bptr++;
+       for (ptr=buf; *ptr!=0; ++ptr) {
+               if (!isspace(*ptr)) {
+                       if (!first_nonspace) {
+                               first_nonspace = ptr;
                        }
-               }
-               else {
-                       CountTrail = 0;
-                       *bptr = *aptr;
-                       aptr++; bptr++;
+                       last_nonspace = ptr;
                }
        }
 
-       if (CountTrail > 0) {
-               bptr -= CountTrail;
+       if ((!first_nonspace) || (!last_nonspace)) {
+               buf[0] = 0;
+               return 0;
        }
 
-       *bptr = '\0';
-       return bptr - buf;
+       new_len = last_nonspace - first_nonspace + 1;
+       memcpy(buf, first_nonspace, new_len);
+       buf[new_len] = 0;
+       return new_len;
 }
 
 
-
-
-
 /**
  * \brief check for the presence of a character within a string (returns count)
  * \param st the string to examine