* add slash-stripper

[citadel.git] / libcitadel / lib / tools.c

diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index 6cb0646ea17133bcdd42937eb4c2dd3f1a796908..5662133be92854609a719e33d314a85281ad3646 100644 (file)
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -456,48 +456,68 @@ char *rfc2047encode(char *line, long length)
        return result;
 }
 
-
 /*
- * Strip leading and trailing spaces from a string
+ * removes double slashes from pathnames
+ * allows / disallows trailing slashes
  */
-long striplt(char *buf)
+void StripSlashes(char *Dir, int TrailingSlash)
 {
-       int CountTrail = 0;
-       int FromStart = 1;
-       char *aptr, *bptr;
+       char *a, *b;
 
-       if ((buf==NULL) || (IsEmptyStr(buf)))
-               return 0;
+       a = b = Dir;
 
-       bptr = aptr = buf;
-
-       while (!IsEmptyStr(aptr)) {
-               if (isspace(*aptr)) {
-                       if (FromStart)
-                               aptr ++;
-                       else {
-                               CountTrail ++;
-                               *bptr = *aptr;
-                               aptr++; bptr++;
-                       }
+       while (!IsEmptyStr(a)) {
+               if (*a == '/') {
+                       while (*a == '/')
+                               a++;
+                       *b = '/';
+                       b++;
                }
                else {
-                       CountTrail = 0;
-                       *bptr = *aptr;
-                       aptr++; bptr++;
+                       *b = *a;
+                       b++; a++;
                }
        }
-
-       if (CountTrail > 0) {
-               bptr -= CountTrail;
+       if ((TrailingSlash) && (*(b - 1) != '/')){
+               *b = '/';
+               b++;
        }
+       *b = '\0';
 
-       *bptr = '\0';
-       return bptr - buf;
 }
 
+/*
+ * Strip leading and trailing spaces from a string
+ */
+size_t striplt(char *buf) {
+       char *first_nonspace = NULL;
+       char *last_nonspace = NULL;
+       char *ptr;
+       size_t new_len = 0;
+
+       if (!buf) {
+               return 0;
+       }
+
+       for (ptr=buf; *ptr!=0; ++ptr) {
+               if (!isspace(*ptr)) {
+                       if (!first_nonspace) {
+                               first_nonspace = ptr;
+                       }
+                       last_nonspace = ptr;
+               }
+       }
 
+       if ((!first_nonspace) || (!last_nonspace)) {
+               buf[0] = 0;
+               return 0;
+       }
 
+       new_len = last_nonspace - first_nonspace + 1;
+       memmove(buf, first_nonspace, new_len);
+       buf[new_len] = 0;
+       return new_len;
+}
 
 
 /**