diff options
| author | jkh <jkh@FreeBSD.org> | 1996-07-22 18:43:21 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-07-22 18:43:21 +0000 |
| commit | 5cfba932d68f723c08a7cec9e646b6cdb6e8665d (patch) | |
| tree | 1c7a8fc705a5cf1373584db52364e3379b101faa | |
| parent | 71d7e65562fff4f46cc9eca9352270a866d28d80 (diff) | |
| download | FreeBSD-src-5cfba932d68f723c08a7cec9e646b6cdb6e8665d.zip FreeBSD-src-5cfba932d68f723c08a7cec9e646b6cdb6e8665d.tar.gz | |
Fix some bogus argument handling - whups! James was right..
| -rw-r--r-- | release/sysinstall/main.c | 5 | ||||
| -rw-r--r-- | usr.sbin/sade/main.c | 5 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/main.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c index 647efd3..13ffea6 100644 --- a/release/sysinstall/main.c +++ b/release/sysinstall/main.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: main.c,v 1.23 1996/07/02 01:03:44 jkh Exp $ + * $Id: main.c,v 1.24 1996/07/12 11:14:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -75,7 +75,6 @@ main(int argc, char **argv) variable_set2(VAR_DEBUG, "YES"); Fake = TRUE; msgConfirm("I'll be just faking it from here on out, OK?"); - --argc, ++argv; } /* Try to preserve our scroll-back buffer */ @@ -99,6 +98,8 @@ main(int argc, char **argv) if (!strstr(argv[0], "sysinstall")) start_arg = 0; + else if (Fake) + start_arg = 2; else start_arg = 1; for (i = start_arg; i < argc; i++) { diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c index 647efd3..13ffea6 100644 --- a/usr.sbin/sade/main.c +++ b/usr.sbin/sade/main.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: main.c,v 1.23 1996/07/02 01:03:44 jkh Exp $ + * $Id: main.c,v 1.24 1996/07/12 11:14:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -75,7 +75,6 @@ main(int argc, char **argv) variable_set2(VAR_DEBUG, "YES"); Fake = TRUE; msgConfirm("I'll be just faking it from here on out, OK?"); - --argc, ++argv; } /* Try to preserve our scroll-back buffer */ @@ -99,6 +98,8 @@ main(int argc, char **argv) if (!strstr(argv[0], "sysinstall")) start_arg = 0; + else if (Fake) + start_arg = 2; else start_arg = 1; for (i = start_arg; i < argc; i++) { diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c index 647efd3..13ffea6 100644 --- a/usr.sbin/sysinstall/main.c +++ b/usr.sbin/sysinstall/main.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: main.c,v 1.23 1996/07/02 01:03:44 jkh Exp $ + * $Id: main.c,v 1.24 1996/07/12 11:14:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -75,7 +75,6 @@ main(int argc, char **argv) variable_set2(VAR_DEBUG, "YES"); Fake = TRUE; msgConfirm("I'll be just faking it from here on out, OK?"); - --argc, ++argv; } /* Try to preserve our scroll-back buffer */ @@ -99,6 +98,8 @@ main(int argc, char **argv) if (!strstr(argv[0], "sysinstall")) start_arg = 0; + else if (Fake) + start_arg = 2; else start_arg = 1; for (i = start_arg; i < argc; i++) { |
