Fixed directory printing in case there was both a ~user and a ~user1.

[unix-history] / usr / src / bin / csh / const.c

diff --git a/usr/src/bin/csh/const.c b/usr/src/bin/csh/const.c
index 88f8274..b7279da 100644 (file)
--- a/usr/src/bin/csh/const.c
+++ b/usr/src/bin/csh/const.c
@@ -6,14 +6,14 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)const.c    5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)const.c    5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
  * tc.const.c: String constants for csh.
  */
 
 #endif /* not lint */
 
 /*
  * tc.const.c: String constants for csh.
  */
 

-#include "sh.h"
+#include "csh.h"

 
 Char STR0[]             = { '0', '\0' };
 Char STR1[]             = { '1', '\0' };
 
 Char STR0[]             = { '0', '\0' };
 Char STR1[]             = { '1', '\0' };


@@ -33,7 +33,6 @@ Char STRspRparen[]    = { ' ', ')', '\0' };
 Char STRTERM[]         = { 'T', 'E', 'R', 'M', '\0' };
 Char STRUSER[]         = { 'U', 'S', 'E', 'R', '\0' };
 Char STRalias[]         = { 'a', 'l', 'i', 'a', 's', '\0' };
 Char STRTERM[]         = { 'T', 'E', 'R', 'M', '\0' };
 Char STRUSER[]         = { 'U', 'S', 'E', 'R', '\0' };
 Char STRalias[]         = { 'a', 'l', 'i', 'a', 's', '\0' };

-Char STRampm[]         = { 'a', 'm', 'p', 'm', '\0' };

 Char STRand[]          = { '&', '\0' };
 Char STRand2[]         = { '&', '&', '\0' };
 Char STRaout[]          = { 'a', '.', 'o', 'u', 't', '\0' };
 Char STRand[]          = { '&', '\0' };
 Char STRand2[]         = { '&', '&', '\0' };
 Char STRaout[]          = { 'a', '.', 'o', 'u', 't', '\0' };


@@ -81,6 +80,8 @@ Char STRml[]          = { '-', 'l', '\0' };
 Char STRmn[]           = { '-', 'n', '\0' };
 Char STRmquestion[]     = { '?' | QUOTE, ' ', '\0' };
 Char STRnice[]         = { 'n', 'i', 'c', 'e', '\0' };
 Char STRmn[]           = { '-', 'n', '\0' };
 Char STRmquestion[]     = { '?' | QUOTE, ' ', '\0' };
 Char STRnice[]         = { 'n', 'i', 'c', 'e', '\0' };

+Char STRnoambiguous[]  = { 'n', 'o', 'a', 'm', 'b', 'i', 'g', 'u', 'o', 'u', 
+                           's', '\0' };

 Char STRnobeep[]       = { 'n', 'o', 'b', 'e', 'e', 'p', '\0' };
 Char STRnoclobber[]    = { 'n', 'o', 'c', 'l', 'o', 'b', 'b', 'e', 'r', '\0' };
 Char STRnoglob[]       = { 'n', 'o', 'g', 'l', 'o', 'b', '\0' };
 Char STRnobeep[]       = { 'n', 'o', 'b', 'e', 'e', 'p', '\0' };
 Char STRnoclobber[]    = { 'n', 'o', 'c', 'l', 'o', 'b', 'b', 'e', 'r', '\0' };
 Char STRnoglob[]       = { 'n', 'o', 'g', 'l', 'o', 'b', '\0' };


@@ -97,6 +98,7 @@ Char STRprompt[]        = { 'p', 'r', 'o', 'm', 'p', 't', '\0' };
 Char STRprompt2[]       = { 'p', 'r', 'o', 'm', 'p', 't', '2', '\0' };
 Char STRpushdsilent[]  = { 'p', 'u', 's', 'h', 'd', 's', 'i', 'l', 'e', 'n',
                            't', '\0' };
 Char STRprompt2[]       = { 'p', 'r', 'o', 'm', 'p', 't', '2', '\0' };
 Char STRpushdsilent[]  = { 'p', 'u', 's', 'h', 'd', 's', 'i', 'l', 'e', 'n',
                            't', '\0' };

+Char STRret[]          = { '\n', '\0' };

 Char STRsavehist[]      = { 's', 'a', 'v', 'e', 'h', 'i', 's', 't', '\0' };
 Char STRsemisp[]       = { ';', ' ', '\0' };
 Char STRshell[]         = { 's', 'h', 'e', 'l', 'l', '\0' };
 Char STRsavehist[]      = { 's', 'a', 'v', 'e', 'h', 'i', 's', 't', '\0' };
 Char STRsemisp[]       = { ';', ' ', '\0' };
 Char STRshell[]         = { 's', 'h', 'e', 'l', 'l', '\0' };