mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-18 15:30:21 +00:00
Code Issues Releases Activity

Be more consistant and use UNZIPPER everywhere.

Browse Source
This commit is contained in:
David E. O'Brien 2007-12-09 02:43:28 +00:00
parent f0693a7533
commit df28e5cc57
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=174473
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/sysinstall/media.c
View File

@ -685,8 +685,7 @@ mediaExtractDistEnd(int zpid, int cpid)
/* Don't check exit status - gunzip seems to return a bogus one! */
if (i < 0) {
if (isDebug())
msgDebug("wait for %s returned status of %d!\n",
USE_GZIP ? "gunzip" : "bunzip2", i);
msgDebug("wait for %s returned status of %d!\n", UNZIPPER, i);
return FALSE;
}
i = waitpid(cpid, &j, 0);
@ -802,8 +801,7 @@ mediaExtractDist(char *dir, char *dist, FILE *fp)
/* Don't check exit status - gunzip seems to return a bogus one! */
if (i < 0) {
if (isDebug())
msgDebug("wait for %s returned status of %d!\n",
USE_GZIP ? "gunzip" : "bunzip2", i);
msgDebug("wait for %s returned status of %d!\n", UNZIPPER, i);
return FALSE;
}
i = waitpid(cpid, &j, 0);

5
usr.sbin/sysinstall/system.c
View File

@ -114,7 +114,7 @@ reap_children(int sig)
static char *
expand(char *fname)
{
char *gunzip = RunningAsInit ? "/stand/gunzip" : "/usr/bin/gunzip";
char *unzipper = RunningAsInit ? "/stand/" UNZIPPER : "/usr/bin/" UNZIPPER;
if (!directory_exists(DOC_TMP_DIR)) {
Mkdir(DOC_TMP_DIR);
@ -125,7 +125,8 @@ expand(char *fname)
}
else
unlink(DOC_TMP_FILE);
if (!file_readable(fname) || vsystem("%s < %s > %s", gunzip, fname, DOC_TMP_FILE))
if (!file_readable(fname) || vsystem("%s < %s > %s", unzipper, fname,
DOC_TMP_FILE))
return NULL;
return DOC_TMP_FILE;
}