diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2007-12-09 02:43:28 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2007-12-09 02:43:28 +0000 |
| commit | df28e5cc57d6a6eb716293f6af7a5663df4f883e (patch) | |
| tree | df17ae9f11a48368e6606b0977e2e502eaf107fc /usr.sbin | |
| parent | f0693a75330718c406867345e373f7ed877accc6 (diff) | |
| download | src-df28e5cc57d6a6eb716293f6af7a5663df4f883e.tar.gz src-df28e5cc57d6a6eb716293f6af7a5663df4f883e.zip | |
Be more consistant and use UNZIPPER everywhere.
Notes
Notes:
svn path=/head/; revision=174473
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysinstall/media.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/system.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c index 408a82abe994..c9a74cacafc4 100644 --- a/usr.sbin/sysinstall/media.c +++ b/usr.sbin/sysinstall/media.c @@ -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); diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c index b7fae6aa8407..4705b63aacac 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/system.c @@ -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; } |