Changeset 9921

Timestamp:

2005-05-23T12:31:13+12:00 (19 years ago)

Author:

mdewsnip

Message:

More code without a hope of working on Windows.

File:

• trunk/gsdl/perllib/docsave.pm (modified) (1 diff)

trunk/gsdl/perllib/docsave.pm

@@ -505 +505 @@
 
     if (defined $collect_dir) {
-    my $dirsep = &util::get_dirsep();
-
-    if ($collect_dir !~ m/$dirsep$/) {
-        $collect_dir .= $dirsep; # ensure there is a slash at the end
-    }
-    
-    if ($source_filename !~ /^$dirsep/) {
-        $source_filename 
-        = &util::filename_cat($collect_dir,$source_filename);
+    my $dirsep_regexp = &util::get_os_dirsep();
+
+    if ($collect_dir !~ /$dirsep_regexp$/) {
+        $collect_dir .= &util::get_dirsep(); # ensure there is a slash at the end
+    }
+
+    # This test is never going to fail on Windows -- is this a problem?
+    if ($source_filename !~ /^$dirsep_regexp/) {
+        $source_filename = &util::filename_cat($collect_dir, $source_filename);
     }
     }