Changeset 11259 for trunk/gsdl/src/recpt/cgiutils.cpp

Timestamp:

2006-02-15T16:38:22+13:00 (18 years ago)

Author:

mdewsnip

Message:

Various little bug fixes and improvements (many to get things working with Visual Studio 2005), by Emanuel Dejanu.

File:

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

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -374 +374 @@
   text_t::const_iterator saveconfend = saveconf.end();
   
-  text_t::iterator arg_ehere = arg_e->begin();
+  text_t::iterator arg_ebegin = arg_e->begin();
   text_t::iterator arg_eend = arg_e->end();
+  text_t::iterator arg_ehere = arg_ebegin;
   while (saveconfhere != saveconfend && arg_ehere != arg_eend) {
     saveconfhere = get_next_save_arg (saveconfhere, saveconfend, argname);
@@ -399 +400 @@
       text_t::const_iterator sav = arg_ehere;
       arg_ehere = getdelimitstr (arg_ehere, arg_eend, '-', argvalue);
-      // replace any '-' chars escaped with 'Zz'
-      bool first = true;
-      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) == 'z') && (*(sav+2) == '-')) &&
-          !((*(sav-1) == 'Z') && (*sav == 'z') && (*(sav+1) == '-'))) argvalue.push_back (*sav);
-          ++sav;
+      if (distance(arg_ebegin, arg_ehere) > 2) {
+        // replace any '-' chars escaped with 'Zz'
+        bool first = true;
+        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) == 'z') && (*(sav+2) == '-')) &&
+            !((*(sav-1) == 'Z') && (*sav == 'z') && (*(sav+1) == '-'))) argvalue.push_back (*sav);
+        ++sav;
+          }
+          first = false;
         }
-        first = false;
       }
-
       argvalue.setencoding(1); // other encoding
       if (!argvalue.empty()) args.setdefaultarg (argname, argvalue, cgiarg_t::compressed_arg);