Changeset 836 for trunk/gsdl/perllib/util.pm

Timestamp:

1999-12-13T16:54:28+13:00 (24 years ago)

Author:

davidb

Message:

improvements to utils

File:

• trunk/gsdl/perllib/util.pm (modified) (4 diffs)

trunk/gsdl/perllib/util.pm

@@ -201 +201 @@
     } elsif (-d $file) {
         # make a new directory (if needed)
-        mkdir ($tempdest, 0775) unless -e $tempdest;
-        
+        unless (-e $tempdest)
+        {
+        my $store_umask = umask(0002);
+        mkdir ($tempdest, 0777);
+        umask($store_umask);
+        }
+
         # get the contents of this directory
         if (!opendir (INDIR, $file)) {
@@ -224 +229 @@
     my ($dir) = @_;
 
-    if (!mkdir ($dir, 0775)) {
+    my $store_umask = umask(0002);
+    my $mkdir_ok = mkdir ($dir, 0777);
+    umask($store_umask);
+    
+    if (!$mkdir_ok) 
+    {
     print STDERR "util::mk_dir could not create directory $dir\n";
     return;
@@ -248 +258 @@
 
     next if $dirname =~ /^(|[a-z]:)$/i;
-    if (!-e $dirsofar && !mkdir ($dirsofar, 0775)) {
-        print STDERR "util::mk_all_dir could not create directory $dirsofar\n";
-        return;
-    }
+    if (!-e $dirsofar)
+        {
+        my $store_umask = umask(0002);
+        my $mkdir_ok = mkdir ($dirsofar, 0777);
+        umask($store_umask);
+        if (!$mkdir_ok)
+        {
+            print STDERR "util::mk_all_dir could not create directory $dirsofar\n";
+            return;
+        }
+        }
     }
 }
@@ -474 +491 @@
     $filename =~ s/[\\\/]+/\\/g;
     } else {
-    $filename =~ s/[\\\/]+/\//g;
+    $filename =~ s/[\/]+/\//g; 
+    # DB: want a filename abc\de.html to remain like this
     }
     $filename =~ s/[\\\/]$//;