Ticket #3552: 800915-mc-url-unescape.patch

lib/strescape.h

@@ -29 +29 @@
 
 gboolean strutils_is_char_escaped (const char *, const char *);
 
+/*
+   In-place unescaping of http %xx sequences.
+*/
+void strutils_url_unescape(char *buff);
+
 #endif

lib/strutil/strescape.c

@@ -253 +253 @@
 }
 
 /* --------------------------------------------------------------------------------------------- */
+
+/* unescape auxiliary function */
+
+/*
+   returns the (integer) digit value to the character,
+   or -1 if not in the valid set '0' ... '9', 'A' ... F'
+*/
+static unsigned int 
+digit_heximal(char dig)
+{
+
+  if ((dig >= '0') && (dig <= '9')) {
+    return dig - '0';
+  }
+  if (dig > 'F') { dig -= 0x20; }
+  if ((dig >= 'A') && (dig <= 'F')) {
+    return dig - 0x37;
+  }
+  return -1;
+}
+
+/*
+  Scans the srce string converting valid %cc hex escapes to their
+  ascii representation into the dest string.
+  Srce and dest refer to the same buffer without any ill effects.
+*/
+
+void
+strutils_url_unescape(char *buff)
+{
+  char *psrc = buff;
+  char *pdst = buff;
+  short int hex8;
+  short int low8;
+  int copy = 0;
+
+  while (*psrc != 0) {
+    if (*psrc != '%') {
+      if (copy) { *pdst++ = *psrc++; continue; }
+      else { pdst++; psrc++; continue; }
+    }
+    copy = 1;
+    // %% escape ?
+    if (*(++psrc) == '%') {
+      *pdst++ = *psrc++; continue;
+    }
+    hex8 = 16 * digit_heximal(*psrc++);
+    low8 = digit_heximal(*psrc++);
+    if ((low8 | hex8) < 0) {
+      // not a valid url escape - leave unmodified
+      *pdst++ = '%';
+      *pdst++ = *(psrc - 2);
+      *pdst++ = *(psrc - 1);
+    } else {
+      *pdst++ = (char) (hex8 + low8);
+    }
+  }
+  *pdst = 0;
+}
+
+/* --------------------------------------------------------------------------------------------- */

src/vfs/ftpfs/ftpfs.c

@@ -110 +110 @@
 #include "lib/vfs/netutil.h"
 #include "lib/vfs/xdirentry.h"
 #include "lib/vfs/gc.h"         /* vfs_stamp_create */
+#include "lib/strescape.h"
 
 #include "ftpfs.h"
 
@@ -622 +623 @@
     else
         name = g_strdup (super->path_element->user);
 
+    strutils_url_unescape(name);
+
     if (ftpfs_get_reply (me, SUP->sock, reply_string, sizeof (reply_string) - 1) == COMPLETE)
     {
         char *reply_up;