diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1999-04-07 22:57:27 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1999-04-07 22:57:27 +0000 |
| commit | e591777ba7019a89be58f540822ac482b6ec54ae (patch) | |
| tree | c8e597813627591592cf9bab148544278d9501c2 /sbin/disklabel/disklabel.c | |
| parent | 73a18b5784c7ae12fca38523b697d21aa5f5ad10 (diff) | |
Kill -F option, it is not needed and just plain wrong anyway
Diffstat (limited to 'sbin/disklabel/disklabel.c')
| -rw-r--r-- | sbin/disklabel/disklabel.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index b2b00010dc4..f17e8ca6b98 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.62 1999/03/23 05:18:49 millert Exp $ */ +/* $OpenBSD: disklabel.c,v 1.63 1999/04/07 22:57:25 millert Exp $ */ /* $NetBSD: disklabel.c,v 1.30 1996/03/14 19:49:24 ghudson Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "$OpenBSD: disklabel.c,v 1.62 1999/03/23 05:18:49 millert Exp $"; +static char rcsid[] = "$OpenBSD: disklabel.c,v 1.63 1999/04/07 22:57:25 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -128,7 +128,7 @@ struct disklabel *makebootarea __P((char *, struct disklabel *, int)); void display __P((FILE *, struct disklabel *)); void display_partition __P((FILE *, struct disklabel *, char **, int, char, int)); int width_partition __P((struct disklabel *, int)); -int editor __P((struct disklabel *, int, char *, char *, int)); +int editor __P((struct disklabel *, int, char *, char *)); int edit __P((struct disklabel *, int)); int editit __P((void)); char *skip __P((char *)); @@ -146,7 +146,6 @@ main(argc, argv) char *argv[]; { int ch, f, writeable, error = 0; - int whole_mode = 0; char *fstabfile = NULL; struct disklabel *lp; FILE *t; @@ -196,9 +195,6 @@ main(argc, argv) usage(); op = EDITOR; break; - case 'F': - whole_mode = 1; - break; case 'f': fstabfile = optarg; break; @@ -274,7 +270,7 @@ main(argc, argv) usage(); if ((lp = readlabel(f)) == NULL) exit(1); - error = editor(lp, f, specname, fstabfile, whole_mode); + error = editor(lp, f, specname, fstabfile); break; case READ: if (argc != 1) @@ -1751,8 +1747,8 @@ usage() " disklabel [-nv] [-r|-d] -e disk%s (edit)\n", blank); fprintf(stderr, - " disklabel [-nv] [-r|-d] [-F] [-f temp] -E disk%.*s (simple editor)\n", - strlen(blank) - 9, blank); + " disklabel [-nv] [-r|-d] [-f temp] -E disk%.*s (simple editor)\n", + strlen(blank) - 4, blank); fprintf(stderr, " disklabel [-nv] [-r]%s -R disk proto (restore)\n", boot); |