[src/netbsd-1-4]: src/bin/csh Pull up revision 1.16 (requested by is):

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

details:   https://anonhg.NetBSD.org/src/rev/b696e3513a1c
branches:  netbsd-1-4
changeset: 470955:b696e3513a1c
user:      he <he%NetBSD.org@localhost>
date:      Sun Oct 08 16:16:10 2000 +0000

description:
Pull up revision 1.16 (requested by is):
  Format string cleanup.

diffstat:

 bin/csh/dir.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 65114f45df7c -r b696e3513a1c bin/csh/dir.c
--- a/bin/csh/dir.c     Sun Oct 08 15:47:27 2000 +0000
+++ b/bin/csh/dir.c     Sun Oct 08 16:16:10 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.2.1 2000/10/08 16:16:10 he 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.2.1 2000/10/08 16:16:10 he 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");