Changeset 23414 for main/trunk

Timestamp:

2010-12-08T11:08:31+13:00 (13 years ago)

Author:

davidb

Message:

Need to be more careful when downgrading a filename to ensure we still return a string that is at least still defined

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -1123 +1123 @@
     # be opened by Perl => convert it to a short DOS-like filename
 
-##  print STDERR "**** asked to downgrade: $filename_full_path\n";
-
-    $filename_full_path = Win32::GetShortPathName($filename_full_path);
-
-##  print STDERR "**** now: $filename_full_path\n";
-
-    # Make sure initial drive letter is lower-case (to fit in with rest of Greenstone)
-    $filename_full_path =~ s/^(.)/\l$1/;
+    my $short_filename = Win32::GetShortPathName($filename_full_path);
+    if (defined $short_filename) {
+        $filename_full_path = $short_filename;
+
+        # Make sure initial drive letter is lower-case (to fit in
+        # with rest of Greenstone)
+        $filename_full_path =~ s/^(.)/\l$1/;
+    }
     }