[src/netbsd-1-5]: src Pullup from trunc, requested by is, approved by jhawk:

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

details:   https://anonhg.NetBSD.org/src/rev/75b2ccd5003b
branches:  netbsd-1-5
changeset: 489715:75b2ccd5003b
user:      is <is%NetBSD.org@localhost>
date:      Sun Oct 08 18:28:41 2000 +0000

description:
Pullup from trunc, requested by is, approved by jhawk:
dir.c 1.16, dig.c 1.2, host.c 1.3
Format string cleanups by sommerfeld.

diffstat:

 bin/csh/dir.c             |  10 +++++-----
 dist/bind/bin/dig/dig.c   |   4 ++--
 dist/bind/bin/host/host.c |  15 +++++++--------
 3 files changed, 14 insertions(+), 15 deletions(-)

diffs (116 lines):

diff -r a14878bc0a9c -r 75b2ccd5003b bin/csh/dir.c
--- a/bin/csh/dir.c     Sun Oct 08 14:53:19 2000 +0000
+++ b/bin/csh/dir.c     Sun Oct 08 18:28:41 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.15 1999/03/19 12:56:53 christos Exp $        */
+/*     $NetBSD: dir.c,v 1.15.10.1 2000/10/08 18:28:41 is Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dir.c      8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dir.c,v 1.15 1999/03/19 12:56:53 christos Exp $");
+__RCSID("$NetBSD: dir.c,v 1.15.10.1 2000/10/08 18:28:41 is Exp $");
 #endif
 #endif /* not lint */
 
@@ -85,7 +85,7 @@
     Char *cp;
     struct directory *dp;
     char    path[MAXPATHLEN];
-    static char *emsg = "csh: Trying to start from \"%s\"\n";
+    static const char emsg[] = "csh: Trying to start from \"%s\"\n";
 
     /* Don't believe the login shell home, because it may be a symlink */
     ecp = getcwd(path, MAXPATHLEN);
@@ -238,8 +238,8 @@
            (void) fprintf(cshout, "\n");
            cur = len;
        }
-       (void) fprintf(cshout, s != dp->di_name ? "~%s%c" : "%s%c",
-               vis_str(s), (dirflag & DIR_VERT) ? '\n' : ' ');
+       (void) fprintf(cshout, "%s%s%c", (s != dp->di_name)? "~" : "",
+           vis_str(s), (dirflag & DIR_VERT) ? '\n' : ' ');
     } while ((dp = dp->di_prev) != dcwd);
     if (!(dirflag & DIR_VERT))
        (void) fprintf(cshout, "\n");
diff -r a14878bc0a9c -r 75b2ccd5003b dist/bind/bin/dig/dig.c
--- a/dist/bind/bin/dig/dig.c   Sun Oct 08 14:53:19 2000 +0000
+++ b/dist/bind/bin/dig/dig.c   Sun Oct 08 18:28:41 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dig.c,v 1.1.1.1 1999/11/20 18:53:58 veego Exp $        */
+/*     $NetBSD: dig.c,v 1.1.1.1.8.1 2000/10/08 18:28:42 is Exp $       */
 
 #ifndef lint
 static const char rcsid[] = "Id: dig.c,v 8.36 1999/11/05 05:05:14 vixie Exp";
@@ -1506,7 +1506,7 @@
                        return (ERROR);
                }
                printf(";; pid %lu: exit %d, signal %d, core %c\n",
-                      pid, WEXITSTATUS(status),
+                      (u_long)pid, WEXITSTATUS(status),
                       WIFSIGNALED(status) ? WTERMSIG(status) : 0,
                       WCOREDUMP(status) ? 't' : 'f');
        }
diff -r a14878bc0a9c -r 75b2ccd5003b dist/bind/bin/host/host.c
--- a/dist/bind/bin/host/host.c Sun Oct 08 14:53:19 2000 +0000
+++ b/dist/bind/bin/host/host.c Sun Oct 08 18:28:41 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: host.c,v 1.2 1999/11/20 19:12:58 veego Exp $   */
+/*     $NetBSD: host.c,v 1.2.8.1 2000/10/08 18:28:42 is Exp $  */
 
 #ifndef lint
 static const char rcsid[] = "Id: host.c,v 8.34 1999/11/11 19:39:10 cyarnell Exp";
@@ -349,7 +349,6 @@
                                        printf ("%s for %s not found, last verified key %s\n",
                                                chase_step & SD_SIG ? "Key" : "Signature",
                                                chase_step & SD_SIG ? chase_signer : chase_domain, 
-                                               chase_domain, 
                                                chase_lastgoodkey ? chase_lastgoodkey : "None");
                                }
                        }
@@ -742,12 +741,12 @@
        do
        {
                stop=(start+width)<length?(start+width):length;
-               printf (pref);
+               printf ("%s", pref);
                for (i = start; i < stop; i++)
                        printf ("%02x ", (u_char) field[i]);
                printf ("\n");
 
-               printf (pref);
+               printf ("%s", pref);
                for (i = start; i < stop; i++)
                        if (isprint(field[i]))
                                printf (" %c ", (u_char) field[i]);
@@ -1237,15 +1236,15 @@
                /* original ttl */
                origttl = cp;
                if (doprint && verbose)
-                       fprintf(file, " %d", ns_get32(cp));
+                       fprintf(file, " %lu", ns_get32(cp));
                cp += INT32SZ;
                /* signature expiration */
                if (doprint && verbose)
-                       fprintf(file, " %d", ns_get32(cp));
+                       fprintf(file, " %lu", ns_get32(cp));
                cp += INT32SZ;
                /* time signed */
                if (doprint && verbose)
-                       fprintf(file, " %d", ns_get32(cp));
+                       fprintf(file, " %lu", ns_get32(cp));
                cp += INT32SZ;
                /* key footprint */
                if (doprint && verbose)
@@ -1454,7 +1453,7 @@
                u_char cdname[NS_MAXCDNAME];
 
                if (doprint && !verbose)
-                       fprintf (file, " (chasing signature)", sigchase-1);
+                       fprintf (file, " (chasing signature %d)", sigchase-1);
 
                /* unpack rr */