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

Timestamp:

2000-10-05T15:10:41+13:00 (24 years ago)

Author:

sjboddie

Message:

fixed a bug in the cp_r perl routine

File:

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

trunk/gsdl/perllib/util.pm

@@ -196 +196 @@
 
     } elsif (-d $file) {
-        print STDERR "directory: $file\n";
+        # make the new directory
+        my ($filename) = $file =~ /([^\\\/]*)$/;
+        $dest = &util::filename_cat ($dest, $filename);
+        my $store_umask = umask(0002);
+        mkdir ($dest, 0777);
+        umask($store_umask);
 
         # get the contents of this directory
@@ -204 +209 @@
         my @filedir = readdir (INDIR);
         closedir (INDIR);
-        my $olddest = $dest;
         foreach $f (@filedir) {
             next if $f =~ /^\.\.?$/;
             # copy all the files in this directory
             my $ff = &util::filename_cat ($file, $f); 
-            if (-d $ff) {
-            # make the new directory
-            $dest = &util::filename_cat ($dest, $f);
-            my $store_umask = umask(0002);
-            mkdir ($dest, 0777);
-            umask($store_umask);
-            }
-            print STDERR "dest: $dest\n";
             &cp_r ($ff, $dest);
-            $dest = $olddest;
         }
         }
 
     } else {
-        print STDERR "ordinary file: $file --> $dest\n";
         &cp($file, $dest);
     }