Refactor unpack_update to create a temporary directory itself.

Signed-off-by: Anders Kaseorg <[email protected]>
haoren3696 · Aug 20, 2009 · 068fa53 · 068fa53
1 parent d21c162
commit 068fa53
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/Ksplice.pm.in b/Ksplice.pm.in
@@ -169,8 +169,9 @@ sub runval_outfile {
 
 sub unpack_update {
 	my ($file) = @_;
-	runval("tar", "--force-local", "-zxf", $file);
-	my ($ksplice) = glob('*/');
+	my $tmpdir = tempdir('ksplice-tmp-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+	runval("tar", "-C", $tmpdir, "--force-local", "-zxf", $file);
+	my ($ksplice) = glob("$tmpdir/*/");
 	chop($ksplice); # remove the trailing slash
 	return $ksplice;
 }

diff --git a/ksplice-apply.in b/ksplice-apply.in
@@ -35,14 +35,11 @@ GetOptions(@common_options,
 
 pod2usage(1) if($help || scalar(@ARGV) != 1);
 
-my $file = abs_path($ARGV[0]);
+my $file = $ARGV[0];
 $debugon = 1 if(defined $debug);
 $debug = abs_path($debug) if (defined $debug);
 
-my $tmpdir = tempdir('ksplice-tmp-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-chdir($tmpdir);
-my $ksplice = unpack_update($file);
-chdir($ksplice);
+chdir(unpack_update($file));
 
 die "No contents file in $file\n" if (!-e "contents");
 open(CONTENTS, '<', "contents");

diff --git a/ksplice-view.in b/ksplice-view.in
@@ -53,11 +53,8 @@ sub view_kid {
 }
 
 sub view_file {
-	my $tmpdir = tempdir('ksplice-tmp-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-	copy($file, "$tmpdir/" . basename($file));
-	chdir($tmpdir);
-	my $ksplice = unpack_update($file);
-	open(PATCH, '<', "$ksplice/patch") or die $!;
+	chdir(unpack_update($file));
+	open(PATCH, '<', "patch") or die $!;
 	local $/;
 	print <PATCH>;
 	close(PATCH);