X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FRestore.pm;h=1beb0891f1f350b577b7856ce024d5527a2fef91;hb=99b9efe77451800084c477ed2139100f830cb7db;hp=f00ce5900924a81bce8be98cef2c332dafe1eaba;hpb=8f5625f9cdf47f8e04be654c4954838b2df3e26d;p=BackupPC.git

diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm
index f00ce59..1beb089 100644
--- a/lib/BackupPC/CGI/Restore.pm
+++ b/lib/BackupPC/CGI/Restore.pm
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0beta0, released 20 Mar 2004.
+# Version 2.1.2, released 5 Sep 2005.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -87,9 +87,6 @@ EOF
     if ( $badFileCnt ) {
         ErrorExit($Lang->{Nice_try__but_you_can_t_put});
     }
-    if ( @fileList == 1 ) {
-	$pathHdr =~ s/(.*)\/.*/$1/;
-    }
     $pathHdr = "/" if ( $pathHdr eq "" );
     if ( $In{type} != 0 && @fileList == $In{fcbMax} ) {
 	#
@@ -184,14 +181,15 @@ EOF
 	# This is necessary to ensure the output gets to the correct place
 	# under mod_perl.
 	#
-	$bpc->cmdSystemOrEval(["$BinDir/BackupPC_tarCreate",
+	$bpc->cmdSystemOrEvalLong(["$BinDir/BackupPC_tarCreate",
 		 "-h", $host,
 		 "-n", $num,
 		 "-s", $share,
 		 @pathOpts,
 		 @fileList
 	    ],
-	    sub { print(@_); }
+	    sub { print(@_); },
+	    1,			# ignore stderr
 	);
     } elsif ( $In{type} == 2 ) {
         #
@@ -221,7 +219,7 @@ EOF
 	# This is necessary to ensure the output gets to the correct place
 	# under mod_perl.
 	#
-	$bpc->cmdSystemOrEval(["$BinDir/BackupPC_zipCreate",
+	$bpc->cmdSystemOrEvalLong(["$BinDir/BackupPC_zipCreate",
 		 "-h", $host,
 		 "-n", $num,
 		 "-c", $In{compressLevel},
@@ -229,7 +227,8 @@ EOF
 		 @pathOpts,
 		 @fileList
 	    ],
-	    sub { print(@_); }
+	    sub { print(@_); },
+	    1,			# ignore stderr
 	);
     } elsif ( $In{type} == 3 ) {
         #