Changeset 2558

Timestamp:

2001-06-15T15:29:54+12:00 (23 years ago)

Author:

sjboddie

Message:

fixed a bug where the collector would have problems if a source directory
was entered with a trailing '\' (e.g. "c:\test\")

Location:

trunk/gsdl/src/recpt

Files:

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

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -1557 +1557 @@
   options += " -about \"" + carriage_replace (args["bc1aboutdesc"] + "_collectorextra_", 0) + "\"";
   options += " -collectdir \"" + tmpdir + "\" ";
+
+  // escape any backslashes in options with a second backslash
+  escape_slashes(options);
+
   text_t optionfile = filename_cat (tmpdir, "mkcol.opt");
   char *optionfilec = optionfile.getcstr();
@@ -1681 +1685 @@
     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");
@@ -1928 +1935 @@
   return url;
 }
+
+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;
+}

trunk/gsdl/src/recpt/collectoraction.h

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