[src/netbsd-1-5]: src/sbin/edlabel Pull up revisions 1.7-1.9 (via patch, requ...

[leo <leo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e160c4e49ac1
branches:  netbsd-1-5
changeset: 489023:e160c4e49ac1
user:      leo <leo%NetBSD.org@localhost>
date:      Thu Aug 10 07:10:24 2000 +0000

description:
Pull up revisions 1.7-1.9 (via patch, requested by leo, approved by thorpej).

   Fix number of parameters in a usage printf and a typo. Noticed by
   Thomas Klausner.

diffstat:

 sbin/edlabel/edlabel.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r b3898ac8fc3b -r e160c4e49ac1 sbin/edlabel/edlabel.c
--- a/sbin/edlabel/edlabel.c    Thu Aug 10 03:54:13 2000 +0000
+++ b/sbin/edlabel/edlabel.c    Thu Aug 10 07:10:24 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: edlabel.c,v 1.7 1998/11/12 16:19:48 christos Exp $     */
+/*     $NetBSD: edlabel.c,v 1.7.10.1 2000/08/10 07:10:24 leo Exp $     */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -460,7 +460,7 @@
                scsi_fict = 1;
 
        printf(modify_cmds, 'a' + maxpartitions - 1,
-               scsi_fict ? " s   : standarize geometry\n" : "");
+               scsi_fict ? " s   : standardize geometry\n" : "");
        for (;;) {
                printf("edlabel/modify> ");
                fflush(stdout);
@@ -482,7 +482,8 @@
                }
                if ((c < 'a') || (c > 'q')) {
                        printf("bad input.  ");
-                       printf(modify_cmds);
+                       printf(modify_cmds, 'a' + maxpartitions - 1,
+                           scsi_fict ? " s   : standardize geometry\n" : "");
                        continue;
                }
                edit_partition(dl, c - 'a', 1);