diff options
author | jkh <jkh@FreeBSD.org> | 1995-04-19 14:54:25 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1995-04-19 14:54:25 +0000 |
commit | 23fe5be93fdf1ed89b79fe2f67920b097c6557b3 (patch) | |
tree | 0209f9599d437aade1fd278a105951c085e5e16f /usr.sbin | |
parent | 496b8887e48a335e5e33705160dc24bae20631d5 (diff) | |
download | FreeBSD-src-23fe5be93fdf1ed89b79fe2f67920b097c6557b3.zip FreeBSD-src-23fe5be93fdf1ed89b79fe2f67920b097c6557b3.tar.gz |
Greatly simplify the calling of mtree - the error handling wasn't working
anyway, at least not with FreeBSD's mtree, and the arguments were being
built incorrectly.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/pkg_install/add/perform.c | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index 415df59..41845a5 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: perform.c,v 1.15 1995/04/10 08:01:44 jkh Exp $"; +static const char *rcsid = "$Id: perform.c,v 1.16 1995/04/19 14:01:49 jkh Exp $"; #endif /* @@ -210,42 +210,9 @@ pkg_do(char *pkg) printf("mtree -u -f %s -d -e -p %s\n", MTREE_FNAME, p ? p->name : "/"); if (!Fake) { - pid_t chpid; - int rval, status; - chpid = fork(); - if (chpid == 0) { - execl("/usr/sbin/mtree", "mtree", "-u", "-f", MTREE_FNAME, - "-d", "-e", "-p", p ? p->name : "/"); - perror("cannot execute mtree"); - exit(3); - } - if (chpid == (pid_t) -1) { - warn("Cannot fork mtree"); - code = 1; - goto fail; - } - if (waitpid(chpid, &status, 0) == -1) { - warn("Cannot wait for mtree"); - code = 1; - goto fail; - } - if (!WIFEXITED(status)) { - whinge("Strange exit from mtree: %x", status); - code = 1; - goto fail; - } -#ifdef DEBUG - whinge("mtree exits %d\n", WEXITSTATUS(status)); -#endif - switch (WEXITSTATUS(status)) { - case 0: - break; /* normal */ - case 2: - whinge("\nWARNING: Mtree attempted some work which may not have completed.\n\tExamine the above output.\n\t(most likely it changed directory permissions)\n"); - break; - default: - whinge("Error status %d from mtree.", WEXITSTATUS(status)); - code = 1; + if (vsystem("/usr/sbin/mtree -u -f %s -d -e -p %s", + MTREE_FNAME, p ? p->name : "/")) { + perror("error in the execution of mtree"); goto fail; } } |