Changeset 2627

Timestamp:

2001-07-06T13:04:33+12:00 (23 years ago)

Author:

sjboddie

Message:

The recent bug fix to prevent collector problems when source directories
ended in a '\' didn't work on some systems (it seems that each different
version of windows has different rules where command line quoting is
converned!). It now simply removes any trailing '\' from each path rather
than attempting to escape all '\'s

Location:

trunk/gsdl/src/recpt

Files:

• collectoraction.cpp (modified) (4 diffs)
• collectoraction.h (modified) (1 diff)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -1559 +1559 @@
   options += " -title \"" + args["bc1fullname"] + "\"";
   options += " -about \"" + carriage_replace (args["bc1aboutdesc"] + "_collectorextra_", 0) + "\"";
-  options += " -collectdir \"" + tmpdir + "\" ";
-
-  // escape any backslashes in options with a second backslash
-  escape_slashes(options);
+  options += " -collectdir \"" + remove_trailing_slashes(tmpdir) + "\" ";
 
   text_t optionfile = filename_cat (tmpdir, "mkcol.opt");
@@ -1671 +1668 @@
       text_t type = "file://"; // default
       if (i < numtypes) type = inputtypes[i];
-      options += " -download \"" + type + format_url(decode_commas(inputvalues[i])) + "\"";
+      options += " -download \"" + 
+    remove_trailing_slashes(type + format_url(decode_commas(inputvalues[i]))) + "\"";
     }
   }
@@ -1688 +1686 @@
     options += " -event_header " + ehead_file;
   }
-
-  // escape any backslashes in options with a second backslash
-  escape_slashes(options);
 
   text_t optionfile = filename_cat (tmpdir, "build.opt");
@@ -1939 +1934 @@
 }
 
-void collectoraction::escape_slashes (text_t &oldval) {
-  text_t newval;
-  text_t::const_iterator here = oldval.begin();
-  text_t::const_iterator end = oldval.end();
-  while (here != end) {
-    if (*here == '\\') newval.push_back('\\');
-    newval.push_back(*here);
-    here ++;
-  }
-  oldval = newval;
-}
+text_t collectoraction::remove_trailing_slashes (text_t str) {
+
+  while (*(str.end()-1) == '\\') {
+    str.pop_back();
+  }
+  return str;
+}

trunk/gsdl/src/recpt/collectoraction.h

@@ -101 +101 @@
   text_t format_url (const text_t &url);
 
-  void escape_slashes (text_t &oldval);
+  text_t remove_trailing_slashes (text_t str);
 
 public: