From dde594130ef232dc0885a193fdb44b91b0cffefa Mon Sep 17 00:00:00 2001
From: is <is@NetBSD.org>
Date: Sun, 8 Oct 2000 09:33:31 +0000
Subject: [PATCH] Format string auditing by Bill Sommerfeld.

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

diff --git a/bin/csh/dir.c b/bin/csh/dir.c
index 8061448244bf..8f0ac7a2faee 100644
--- a/bin/csh/dir.c
+++ b/bin/csh/dir.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dir.c,v 1.15 1999/03/19 12:56:53 christos Exp $	*/
+/*	$NetBSD: dir.c,v 1.16 2000/10/08 09:33:31 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.16 2000/10/08 09:33:31 is Exp $");
 #endif
 #endif /* not lint */
 
@@ -85,7 +85,7 @@ dinit(hp)
     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 @@ printdirs()
 	    (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");