Changeset 1504

Timestamp:

2000-09-06T14:06:58+12:00 (24 years ago)

Author:

sjboddie

Message:

'-'s in the compressed args are now escaped with 'Zz' (instead of the old 'z')
I know this is an ugly hack... It works though.

File:

• trunk/gsdl/src/recpt/cgiutils.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -132 +132 @@
 
   while (here != end) {
-    if (*here == '-') outtext += "Z-";
+    if (*here == '-') outtext += "Zz-";
     else outtext.push_back (*here);
     here ++;
@@ -321 +321 @@
       text_t::const_iterator sav = arg_ehere;
       arg_ehere = getdelimitstr (arg_ehere, arg_eend, '-', argvalue);
-      // replace any '-' chars escaped with 'Z'
+      // replace any '-' chars escaped with 'Zz'
       bool first = true;
-      while (*(arg_ehere-2) == 'Z') {
+      while ((*(arg_ehere-3) == 'Z') && (*(arg_ehere-2) == 'z')) {
         if (first) argvalue.clear();
         arg_ehere = (findchar (arg_ehere, arg_eend, '-')) + 1;
         while (sav != (arg_ehere-1)) {
-          if (!((*sav == 'Z') && (*(sav+1) == '-'))) argvalue.push_back (*sav);
+          if (!((*sav == 'Z') && (*(sav+1) == 'z') && (*(sav+2) == '-')) &&
+          !((*(sav-1) == 'Z') && (*sav == 'z') && (*(sav+1) == '-'))) argvalue.push_back (*sav);
           sav ++;
         }