Changeset 607

Timestamp:

1999-09-21T23:30:39+12:00 (25 years ago)

Author:

sjboddie

Message:

added ability to escape out '-' in saved args (currently
with a 'Z' ???)

Location:

trunk/gsdl/src/recpt

Files:

• cgiutils.cpp (modified) (6 diffs)
• cgiutils.h (modified) (1 diff)

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.9  1999/09/21 11:30:39  sjboddie
+   added ability to escape out '-' in saved args (currently
+   with a 'Z' ???)
+
    Revision 1.8  1999/09/07 04:56:53  sjboddie
    added GPL notice
@@ -144 +148 @@
     
     // convert %xx and + to their appropriate equivalents
-    decode_cgi_arg (value);
+    if (key != "e") decode_cgi_arg (value);
+
     value.setencoding(1); // other encoding
     // store this key=value pair
     if (!key.empty()) args.setarg (key, value, cgiarg_t::cgi_arg);
   }
+}
+
+text_t minus_safe (const text_t &intext) {
+
+  text_t outtext;
+
+  text_t::const_iterator here = intext.begin ();
+  text_t::const_iterator end = intext.end ();
+
+  while (here != end) {
+    if (*here == '-') outtext += "Z-";
+    else outtext.push_back (*here);
+    here ++;
+  }
+  return outtext;
 }
 
@@ -164 +184 @@
     ((c >= 'A') && (c <= 'Z')) ||
     ((c >= '0') && (c <= '9')) ||
-    (c == '-') || (c == '+')) {
+    (c == '+') || (c == '%')) {
       // alphanumeric character
       outtext.push_back(c);
@@ -189 +209 @@
                        text_t::const_iterator last,
                        text_t &argname) {
+  text_t::const_iterator sav = first;
   first = getdelimitstr (first, last, '-', argname);
   return first;
@@ -330 +351 @@
     // found the argument information
     if (argnameinfo->multiplechar) {
+      text_t::const_iterator sav = arg_ehere;
       arg_ehere = getdelimitstr (arg_ehere, arg_eend, '-', argvalue);
+      // replace any '-' chars escaped with 'Z'
+      if (*(arg_ehere-2) == 'Z') {
+        argvalue.clear();
+        arg_ehere = (findchar (arg_ehere, arg_eend, '-')) + 1;
+        while (sav != (arg_ehere-1)) {
+          if (!((*sav == 'Z') && (*(sav+1) == '-'))) argvalue.push_back (*sav);
+          sav ++;
+        }
+      }
+
       argvalue.setencoding(1); // other encoding
       if (!argvalue.empty()) args.setdefaultarg (argname, argvalue, cgiarg_t::compressed_arg);
@@ -404 +436 @@
     // found the argument information
     if (argnameinfo->multiplechar) {
-      // multiple character argument -- make sure it is cgi safe
-      compressed_args += cgi_safe (outconvert.convert(args[argname]));
+      // multiple character argument -- sort out any '-' chars
+      compressed_args += minus_safe (outconvert.convert(args[argname]));
       if (saveconfhere != saveconfend) compressed_args.push_back ('-');
 

trunk/gsdl/src/recpt/cgiutils.h

@@ -40 +40 @@
 // split up the cgi arguments
 void split_cgi_args (text_t argstr, cgiargsclass &args);
+
+// turns any '-' in a cgi argument into "(-)"
+text_t minus_safe (const text_t &intext);
 
 // returns the encoded version of a cgi argument