* missing encoding function added

* some tiny fixes...

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index ef20f954313a9e1156aa5cd5fff7fc40d8c78fe1..0855af01e7d7cc061a0eda551e0bb1b0ad55f9b7 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -227,6 +227,7 @@ void StrBufPrintf(StrBuf *Buf, const char *format, ...) __attribute__((__format_
 void StrBufCutLeft(StrBuf *Buf, int nChars);
 void StrBufCutRight(StrBuf *Buf, int nChars);
 void StrBufEUid_unescapize(StrBuf *target, StrBuf *source);
+void StrBufEUid_escapize(StrBuf *target, StrBuf *source);
 
 long StrTol(StrBuf *Buf);
 

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index 63f47b16d1ef82d4017dac007572e25acfcda4f8..30c728f4433deacdcb47d49ac57cb725a2ad49f1 100644 (file)
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -1,4 +1,4 @@
-
+#include <ctype.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
@@ -147,7 +147,7 @@ void StrBufAppendBuf(StrBuf *Buf, StrBuf *AppendBuf, size_t Offset)
                return;
        if (Buf->BufSize - Offset < AppendBuf->BufUsed)
                IncreaseBuf(Buf, (Buf->BufUsed > 0), AppendBuf->BufUsed);
-       memcpy(Buf->buf + Buf->BufUsed - 1, 
+       memcpy(Buf->buf + Buf->BufUsed, 
               AppendBuf->buf + Offset, 
               AppendBuf->BufUsed - Offset);
        Buf->BufUsed += AppendBuf->BufUsed - Offset;
@@ -171,10 +171,10 @@ int StrBufSub(StrBuf *dest, const StrBuf *Source, size_t Offset, size_t nChars)
        }
        if (Offset + nChars < Source->BufUsed)
        {
-               if (nChars < dest->BufSize)
+               if (nChars > dest->BufSize)
                        IncreaseBuf(dest, 0, nChars + 1);
                memcpy(dest->buf, Source->buf + Offset, nChars);
-               dest->BufUsed = nChars + 1;
+               dest->BufUsed = nChars;
                dest->buf[dest->BufUsed] = '\0';
                return nChars;
        }
@@ -414,3 +414,37 @@ void StrBufEUid_unescapize(StrBuf *target, StrBuf *source)
        }
 }
 
+
+/*
+ * string conversion function
+ */
+void StrBufEUid_escapize(StrBuf *target, StrBuf *source) 
+{
+       int i, len;
+
+       if (target != NULL)
+               FlushStrBuf(target);
+
+       if (source == NULL ||target == NULL)
+       {
+               return;
+       }
+
+       len = source->BufUsed;
+       for (i=0; i<len; ++i) {
+               if (target->BufUsed + 4 >= target->BufSize)
+                       IncreaseBuf(target, 1, -1);
+               if ( (isalnum(source->buf[i])) || 
+                    (source->buf[i]=='-') || 
+                    (source->buf[i]=='_') ) {
+                       target->buf[target->BufUsed++] = source->buf[i];
+               }
+               else {
+                       sprintf(&target->buf[target->BufUsed], 
+                               "=%02X", 
+                               source->buf[i]);
+                       target->BufUsed += 3;
+               }
+       }
+       target->buf[target->BufUsed + 1] = '\0';
+}