[src/netbsd-1-5]: src/bin pullup (approved by releng-1-5)

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

details:   https://anonhg.NetBSD.org/src/rev/362630ea3ba4
branches:  netbsd-1-5
changeset: 488774:362630ea3ba4
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Jul 27 16:15:27 2000 +0000

description:
pullup (approved by releng-1-5)
printf-like format pedant.  do not pass string variable alone.  use "%s".
from openbsd.

/cvsroot/basesrc/bin/dd/conv.c  1.8 -> 1.9
/cvsroot/basesrc/bin/cp/cp.c    1.29 -> 1.30
/cvsroot/basesrc/bin/chmod/chmod.c      1.22 -> 1.23

diffstat:

 bin/chmod/chmod.c |   6 +++---
 bin/cp/cp.c       |   6 +++---
 bin/dd/conv.c     |  12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (87 lines):

diff -r 1f149ff133f7 -r 362630ea3ba4 bin/chmod/chmod.c
--- a/bin/chmod/chmod.c Thu Jul 27 16:12:34 2000 +0000
+++ b/bin/chmod/chmod.c Thu Jul 27 16:15:27 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chmod.c,v 1.22 2000/01/20 02:50:54 mycroft Exp $       */
+/*     $NetBSD: chmod.c,v 1.22.4.1 2000/07/27 16:15:27 itojun Exp $    */
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)chmod.c    8.8 (Berkeley) 4/1/94";
 #else
-__RCSID("$NetBSD: chmod.c,v 1.22 2000/01/20 02:50:54 mycroft Exp $");
+__RCSID("$NetBSD: chmod.c,v 1.22.4.1 2000/07/27 16:15:27 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -156,7 +156,7 @@
                errx(1, "invalid file mode: %s", mode);
 
        if ((ftsp = fts_open(++argv, fts_options, 0)) == NULL)
-               err(1, argv[0]);
+               err(1, "%s", argv[0]);
        for (rval = 0; (p = fts_read(ftsp)) != NULL;) {
                switch (p->fts_info) {
                case FTS_D:
diff -r 1f149ff133f7 -r 362630ea3ba4 bin/cp/cp.c
--- a/bin/cp/cp.c       Thu Jul 27 16:12:34 2000 +0000
+++ b/bin/cp/cp.c       Thu Jul 27 16:15:27 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cp.c,v 1.28 1999/09/05 16:14:43 kleink Exp $   */
+/*     $NetBSD: cp.c,v 1.28.8.1 2000/07/27 16:15:28 itojun Exp $       */
 
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -47,7 +47,7 @@
 #if 0
 static char sccsid[] = "@(#)cp.c       8.5 (Berkeley) 4/29/95";
 #else
-__RCSID("$NetBSD: cp.c,v 1.28 1999/09/05 16:14:43 kleink Exp $");
+__RCSID("$NetBSD: cp.c,v 1.28.8.1 2000/07/27 16:15:28 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -268,7 +268,7 @@
        base = 0;       /* XXX gcc -Wuninitialized (see comment below) */
 
        if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
-               err(1, argv[0]);
+               err(1, "%s", argv[0]);
        for (rval = 0; (curr = fts_read(ftsp)) != NULL;) {
                switch (curr->fts_info) {
                case FTS_NS:
diff -r 1f149ff133f7 -r 362630ea3ba4 bin/dd/conv.c
--- a/bin/dd/conv.c     Thu Jul 27 16:12:34 2000 +0000
+++ b/bin/dd/conv.c     Thu Jul 27 16:15:27 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conv.c,v 1.8 1998/07/28 05:15:46 mycroft Exp $ */
+/*     $NetBSD: conv.c,v 1.8.10.1 2000/07/27 16:15:28 itojun Exp $     */
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)conv.c     8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: conv.c,v 1.8 1998/07/28 05:15:46 mycroft Exp $");
+__RCSID("$NetBSD: conv.c,v 1.8.10.1 2000/07/27 16:15:28 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -101,10 +101,10 @@
 /* Build a smaller version (i.e. for a miniroot) */
 /* These can not be called, but just in case...  */
 static char no_block[] = "unblock and -DNO_CONV?";
-void block()       { errx(1, no_block + 2); }
-void block_close() { errx(1, no_block + 2); }
-void unblock()       { errx(1, no_block); }
-void unblock_close() { errx(1, no_block); }
+void block()       { errx(1, "%s", no_block + 2); }
+void block_close() { errx(1, "%s", no_block + 2); }
+void unblock()       { errx(1, "%s", no_block); }
+void unblock_close() { errx(1, "%s", no_block); }
 #else  /* NO_CONV */
 
 /*