diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-12-04 10:26:37 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-12-04 10:26:37 +0000 |
| commit | c6cd6d6c6958c01db27e9bbba1ae80f1a88c84aa (patch) | |
| tree | 78aed3fdaff8236331baf6e20880e15e4d538533 | |
| parent | 9706e9e8d21a75986cd94cd298597cd8d2fbb77d (diff) | |
rearrange argv[0] code
| -rw-r--r-- | sbin/newfs/newfs.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 4cb953e1778..76c05ad1f11 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.7 1996/12/04 08:52:18 deraadt Exp $ */ +/* $OpenBSD: newfs.c,v 1.8 1996/12/04 10:26:36 deraadt Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.7 1996/12/04 08:52:18 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.8 1996/12/04 10:26:36 deraadt Exp $"; #endif #endif /* not lint */ @@ -350,18 +350,19 @@ main(argc, argv) special = argv[0]; if (!mfs) { - char name[MAXPATHLEN]; + char execname[MAXPATHLEN], name[MAXPATHLEN]; if (fstype == NULL) fstype = readlabelfs(special); if (fstype == NULL || strcmp(fstype, "ffs")) { - snprintf(name, sizeof name, "%s/newfs_%s", _PATH_SBIN, - fstype); + snprintf(name, sizeof name, "newfs_%s", fstype); saveargv[0] = name; - (void)execv(name, saveargv); - snprintf(name, sizeof name, "%s/newfs_%s", _PATH_USRSBIN, - fstype); - (void)execv(name, saveargv); + snprintf(execname, sizeof execname, "%s/newfs_%s", + _PATH_SBIN, fstype); + (void)execv(execname, saveargv); + snprintf(execname, sizeof execname, "%s/newfs_%s", + _PATH_USRSBIN, fstype); + (void)execv(execname, saveargv); err(1, "%s not found", name); } } |