system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 14:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

When invoking tar, make sure the mode option (-x) is first.

Browse source
This commit is contained in:
Tim Kientzle 2004-04-08 06:06:42 +00:00
parent 49a74476a6
commit b1782cbaa9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=128026
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
usr.sbin/pkg_install/lib/file.c
View file

@ -328,9 +328,9 @@ copy_hierarchy(const char *dir, const char *fname, Boolean to)
int
unpack(const char *pkg, const char *flist)
{
char args[10], suff[80], *cp;
char *comp, suff[80], *cp;
args[0] = '\0';
comp = "";
/*
* Figure out by a crude heuristic whether this or not this is probably
* compressed and whichever compression utility was used (gzip or bzip2).
@ -341,17 +341,16 @@ unpack(const char *pkg, const char *flist)
strcpy(suff, cp + 1);
if (strchr(suff, 'z') || strchr(suff, 'Z')) {
if (strchr(suff, 'b'))
strcpy(args, "-j");
comp = "-j";
else
strcpy(args, "-z");
comp = "-z";
}
}
}
else
/* XXX: need to handle .tgz also */
strcpy(args, "-j");
strcat(args, " -xpf");
if (vsystem("tar %s '%s' %s", args, pkg, flist ? flist : "")) {
comp = "-j";
if (vsystem("tar -xp %s -f '%s' %s", comp, pkg, flist ? flist : "")) {
warnx("tar extract of %s failed!", pkg);
return 1;
}