Changeset 13788

Timestamp:

Jun 13, 2007, 9:16:11 AM (19 years ago)

Author:

eugene

Message:

filename_absolute should prepend a /

File:

• trunk/PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (9 diffs)

trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.59 2007-06-08 22:53:39 eugene Exp $
+# $Id: Config.pm,v 1.60 2007-06-13 19:16:11 eugene Exp $
 
 package PS::IPP::Config;
@@ -281 +281 @@
     }
     if ($scheme eq 'path' or $scheme eq 'file') {
+        # guaranteed to have a scheme (path:// or file://)
         return $self->convert_filename_absolute( $name );
     }
@@ -304 +305 @@
         }
         if ($scheme eq 'path' or $scheme eq 'file') {
+            # guaranteed to have a scheme (path:// or file://)
             $name = $self->convert_filename_absolute( $name );
         }
@@ -338 +340 @@
         }
         if ($scheme eq 'path' or $scheme eq 'file') {
+            # guaranteed to have a scheme (path:// or file://)
             $name = $self->convert_filename_absolute( $name );
         }
@@ -436 +439 @@
 
     # Might need to create a directory
+    # not guaranteed to have a scheme (path:// or file://) - might be /PATH/foobar
+    # a relative path (PATH/foobar) is invalid here
     my $resolved = $self->convert_filename_absolute( $name );
     my ( $vol, $dirs, $file ) = File::Spec->splitpath( $resolved );
@@ -447 +452 @@
 
 # Convert a relative filename (e.g., "path://PATH/file") to an absolute (e.g., "/path/to/file")
+# note that file://PATH/file resolves to /PATH/file, regardless of the number of leading slashes
 sub convert_filename_absolute
 {
@@ -457 +463 @@
     }
 
-    $name =~ s|/$||;
+    $name =~ s|/$||; # drop tailing slashes (foobar/ to foobar)
     my ($scheme) = $name =~ m|^(\S+):|; # The scheme, e.g., file, path
+
+    ## if this is already an absolute path (/PATH/file), just return the path
+    unless (defined $scheme) { 
+        if ($name =~ m|^/|) { return $name; }
+        # without a leading slash, this is an error
+        carp "Programming error";
+        exit($PS_EXIT_PROG_ERROR);
+    }
+
     $name =~ s|^\S+:/*||;
-    return $name if lc($scheme) eq 'file';
+    $name = '/' . $name;
+
+    if (lc($scheme) eq 'file') {
+        return $name;
+    }
 
     if (lc($scheme) eq 'path') {
@@ -470 +489 @@
     }
 
-    return $name;
+    # looks like we cannot reach here without an invalid scheme.  
+    # programming error?
+    # return $name;
+
+    carp "Programming error";
+    exit($PS_EXIT_PROG_ERROR);
 }
 
@@ -490 +514 @@
         if ($scheme eq 'path' or $scheme eq 'file') {
             # We may as well search for a 'better' path
+            # guaranteed to have a scheme (path:// or file://)
             $name = $self->convert_filename_absolute( $name );
         } elsif ($scheme eq 'neb') {