15 files changed, 61 insertions, 61 deletions

diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c
index aa4e74ca711f..3c4a1869ff41 100644
--- a/bin/csh/alloc.c
+++ b/bin/csh/alloc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alloc.c,v 1.2 1994/09/24 02:53:45 davidg Exp $
+ *	$Id: alloc.c,v 1.3 1995/03/19 13:28:10 joerg Exp $
  */
 
 #ifndef lint
@@ -122,6 +122,6 @@ showall(v, t)
 {
     memtop = (char *) sbrk(0);
     (void) fprintf(cshout, "Allocated memory from 0x%lx to 0x%lx (%ld).\n",
-	    (unsigned long) membot, (unsigned long) memtop, 
+	    (unsigned long) membot, (unsigned long) memtop,
                 (unsigned long) (memtop - membot));
 }
diff --git a/bin/csh/const.c b/bin/csh/const.c
index 9555edd9e5f3..4dac78293cdd 100644
--- a/bin/csh/const.c
+++ b/bin/csh/const.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: const.c,v 1.2 1994/09/24 02:53:48 davidg Exp $
  */
 
 #ifndef lint
@@ -72,7 +72,7 @@ Char STRcent2[] 	= { '%', '%', '\0' };
 Char STRcenthash[] 	= { '%', '#', '\0' };
 Char STRcentplus[] 	= { '%', '+', '\0' };
 Char STRcentminus[] 	= { '%', '-', '\0' };
-Char STRchase_symlinks[] = { 'c', 'h', 'a', 's', 'e', '_', 's', 'y', 'm', 'l', 
+Char STRchase_symlinks[] = { 'c', 'h', 'a', 's', 'e', '_', 's', 'y', 'm', 'l',
 			    'i', 'n', 'k', 's', '\0' };
 Char STRchild[]		= { 'c', 'h', 'i', 'l', 'd', '\0' };
 Char STRcolon[]		= { ':', '\0' };
@@ -90,7 +90,7 @@ Char STRfignore[]	= { 'f', 'i', 'g', 'n', 'o', 'r', 'e', '\0' };
 Char STRfilec[] = { 'f', 'i', 'l', 'e', 'c', '\0' };
 #endif /* FILEC */
 Char STRhistchars[]	= { 'h', 'i', 's', 't', 'c', 'h', 'a', 'r', 's', '\0' };
-Char STRtildothist[]    = { '~', '/', '.', 'h', 'i', 's', 't', 'o', 'r', 
+Char STRtildothist[]    = { '~', '/', '.', 'h', 'i', 's', 't', 'o', 'r',
 		            'y', '\0' };
 Char STRhistfile[]	= { 'h', 'i', 's', 't', 'f', 'i', 'l', 'e', '\0' };
 Char STRhistory[] 	= { 'h', 'i', 's', 't', 'o', 'r', 'y', '\0' };
@@ -109,7 +109,7 @@ Char STRml[]		= { '-', 'l', '\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', 
+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' };
@@ -121,7 +121,7 @@ Char STRnotify[]	= { 'n', 'o', 't', 'i', 'f', 'y', '\0' };
 Char STRor[]		= { '|', '\0' };
 Char STRor2[]		= { '|', '|', '\0' };
 Char STRpath[]          = { 'p', 'a', 't', 'h', '\0' };
-Char STRprintexitvalue[] = { 'p', 'r', 'i', 'n', 't', 'e', 'x', 'i', 't', 'v', 
+Char STRprintexitvalue[] = { 'p', 'r', 'i', 'n', 't', 'e', 'x', 'i', 't', 'v',
 			    'a', 'l', 'u', 'e', '\0' };
 Char STRprompt[]        = { 'p', 'r', 'o', 'm', 'p', 't', '\0' };
 Char STRprompt2[]       = { 'p', 'r', 'o', 'm', 'p', 't', '2', '\0' };
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 3113071646a1..f6a24e3b9c4f 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: csh.c,v 1.2 1994/09/24 02:53:51 davidg Exp $
  */
 
 #ifndef lint
@@ -618,7 +618,7 @@ importpath(cp)
 	for (;;) {
 	    if ((c = *dp) == ':' || c == 0) {
 		*dp = 0;
-		if ((*cp != '/' || *cp == '\0') && (euid == 0 || uid == 0)) 
+		if ((*cp != '/' || *cp == '\0') && (euid == 0 || uid == 0))
 		    (void) fprintf(csherr,
 	    "Warning: imported path contains relative components\n");
 		pv[i++] = Strsave(*cp ? cp : STRdot);
@@ -809,7 +809,7 @@ rechist()
   	    (void) Strcat(buf, STRsldthist);
   	}
 
-  	if ((fp = creat(short2str(hfile), 0600)) == -1) 
+  	if ((fp = creat(short2str(hfile), 0600)) == -1)
   	    return;
 
 	oldidfds = didfds;
@@ -873,14 +873,14 @@ int sig;
 
     /*
      * We kill the last foreground process group. It then becomes
-     * responsible to propagate the SIGHUP to its progeny. 
+     * responsible to propagate the SIGHUP to its progeny.
      */
     {
 	struct process *pp, *np;
 
 	for (pp = proclist.p_next; pp; pp = pp->p_next) {
 	    np = pp;
-	    /* 
+	    /*
 	     * Find if this job is in the foreground. It could be that
 	     * the process leader has exited and the foreground flag
 	     * is cleared for it.
@@ -888,7 +888,7 @@ int sig;
 	    do
 		/*
 		 * If a process is in the foreground; we try to kill
-		 * it's process group. If we succeed, then the 
+		 * it's process group. If we succeed, then the
 		 * whole job is gone. Otherwise we keep going...
 		 * But avoid sending HUP to the shell again.
 		 */
@@ -1267,9 +1267,9 @@ vis_fputc(ch, fp)
 {
     char uenc[5];	/* 4 + NULL */
 
-    if (ch & QUOTE) 
+    if (ch & QUOTE)
 	return fputc(ch & TRIM, fp);
-    /* 
+    /*
      * XXX: When we are in AsciiOnly we want all characters >= 0200 to
      * be encoded, but currently there is no way in vis to do that.
      */
diff --git a/bin/csh/dir.c b/bin/csh/dir.c
index 5b2a89a1d260..f908a5d9f936 100644
--- a/bin/csh/dir.c
+++ b/bin/csh/dir.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: dir.c,v 1.2 1994/09/24 02:53:54 davidg Exp $
  */
 
 #ifndef lint
@@ -221,7 +221,7 @@ printdirs()
 	}
 	if (!(dirflag & DIR_LONG) && hp != NULL && !eq(hp, STRslash) &&
 	    (len = Strlen(hp), Strncmp(hp, dp->di_name, len) == 0) &&
-	    (dp->di_name[len] == '\0' || dp->di_name[len] == '/')) 
+	    (dp->di_name[len] == '\0' || dp->di_name[len] == '/'))
 	    len = Strlen(s = (dp->di_name + len)) + 2;
 	else
 	    len = Strlen(s = dp->di_name) + 1;
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index 1b101edcae0b..276ea2b59c13 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: dol.c,v 1.2 1994/09/24 02:53:56 davidg Exp $
  */
 
 #ifndef lint
@@ -425,7 +425,7 @@ Dgetdol()
 	if (dimen || bitset)
 	    stderror(ERR_SYNTAX);
 	if (backpid != 0) {
-	    if (dolbang) 
+	    if (dolbang)
 		xfree((ptr_t) dolbang);
 	    setDolp(dolbang = putn(backpid));
 	}
@@ -645,13 +645,13 @@ fixDolMod()
 		    dolwcnt = 10000;
 		c = DgetC(0);
 	    }
-	    if ((c == 'g' && dolmcnt != 10000) || 
+	    if ((c == 'g' && dolmcnt != 10000) ||
 		(c == 'a' && dolwcnt != 10000)) {
 		if (c == 'g')
 		    dolmcnt = 10000;
 		else
 		    dolwcnt = 10000;
-		c = DgetC(0); 
+		c = DgetC(0);
 	    }
 
 	    if (c == 's') {	/* [eichin:19910926.0755EST] */
@@ -659,12 +659,12 @@ fixDolMod()
 		int delim = DgetC(0);
 		dolmod[dolnmod++] = c;
 		dolmod[dolnmod++] = delim;
-		
+
 		if (!delim || letter(delim)
 		    || Isdigit(delim) || any(" \t\n", delim)) {
 		    seterror(ERR_BADSUBST);
 		    break;
-		}	
+		}
 		while ((c = DgetC(0)) != (-1)) {
 		    dolmod[dolnmod++] = c;
 		    if(c == delim) delimcnt--;
@@ -708,7 +708,7 @@ setDolp(cp)
 	    Char *lhsub, *rhsub, *np;
 	    size_t lhlen = 0, rhlen = 0;
 	    int didmod = 0;
-		
+
 	    delim = dolmod[++i];
 	    if (!delim || letter(delim)
 		|| Isdigit(delim) || any(" \t\n", delim)) {
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index 488805a852cc..5a444f3b6f9e 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: exec.c,v 1.2 1994/09/24 02:53:59 davidg Exp $
  */
 
 #ifndef lint
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 5/31/93";
 # include <stdarg.h>
 #else
 # include <varargs.h>
-#endif 
+#endif
 
 #include "csh.h"
 #include "extern.h"
@@ -696,7 +696,7 @@ tellmewhat(lex)
 	if (eq(sp->word, str2short(bptr->bname))) {
 	    if (aliased)
 		prlex(cshout, lex);
-	    (void) fprintf(cshout, "%s: shell built-in command.\n", 
+	    (void) fprintf(cshout, "%s: shell built-in command.\n",
 			   vis_str(sp->word));
 	    sp->word = s0;	/* we save and then restore this */
 	    return;
diff --git a/bin/csh/file.c b/bin/csh/file.c
index 8046b92d2373..0d1a0b5716ab 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: file.c,v 1.2 1994/09/24 02:54:03 davidg Exp $
  */
 
 #ifndef lint
@@ -521,7 +521,7 @@ again:				/* search for matches */
 	return (numitems);
     }
     else {			/* LIST */
-	qsort((ptr_t) items, numitems, sizeof(items[0]), 
+	qsort((ptr_t) items, numitems, sizeof(items[0]),
 		(int (*) __P((const void *, const void *))) sortscmp);
 	print_by_column(looking_for_lognames ? NULL : tilded_dir,
 			items, numitems);
diff --git a/bin/csh/func.c b/bin/csh/func.c
index 7f9850840893..e409197e90fe 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: func.c,v 1.2 1994/09/24 02:54:04 davidg Exp $
  */
 
 #ifndef lint
@@ -860,12 +860,12 @@ wfree()
 	if (wp->w_end.type != I_SEEK && wp->w_start.type == wp->w_end.type &&
 	    wp->w_start.type == o.type) {
 	    if (wp->w_end.type == F_SEEK) {
-		if (o.f_seek >= wp->w_start.f_seek && 
+		if (o.f_seek >= wp->w_start.f_seek &&
 		    (wp->w_end.f_seek == 0 || o.f_seek < wp->w_end.f_seek))
 		    break;
 	    }
 	    else {
-		if (o.a_seek >= wp->w_start.a_seek && 
+		if (o.a_seek >= wp->w_start.a_seek &&
 		    (wp->w_end.a_seek == 0 || o.a_seek < wp->w_end.a_seek))
 		    break;
 	    }
diff --git a/bin/csh/glob.c b/bin/csh/glob.c
index aa967a0644f0..2dd0895911dc 100644
--- a/bin/csh/glob.c
+++ b/bin/csh/glob.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: glob.c,v 1.2 1994/09/24 02:54:05 davidg Exp $
  */
 
 #ifndef lint
@@ -574,7 +574,7 @@ tglob(t)
 	     */
 	    if (c == '`') {
 		gflag |= G_CSH;
-		while (*p && *p != '`') 
+		while (*p && *p != '`')
 		    if (*p++ == '\\') {
 			if (*p)		/* Quoted chars */
 			    p++;
@@ -806,7 +806,7 @@ pword()
     pnleft = MAXPATHLEN - 4;
 }
 
-int 
+int
 Gmatch(string, pattern)
     Char *string, *pattern;
 {
@@ -829,7 +829,7 @@ Gmatch(string, pattern)
 
     blkfree(blk);
     return(gres == gpol);
-} 
+}
 
 static int
 pmatch(string, pattern)
@@ -870,7 +870,7 @@ pmatch(string, pattern)
 			      (*(pattern-2) & TRIM) <= stringc);
 		    pattern++;
 		}
-		else 
+		else
 		    match = (stringc == (rangec & TRIM));
 	    }
 	    if (rangec == 0)
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index d6d253ca63c9..6051d9ac64b1 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: lex.c,v 1.2 1994/09/24 02:54:09 davidg Exp $
  */
 
 #ifndef lint
@@ -575,12 +575,12 @@ getdol()
 		int delimcnt = 2;
 		int delim = getC(0);
 		*np++ = delim;
-		
+
 		if (!delim || letter(delim)
 		    || Isdigit(delim) || any(" \t\n", delim)) {
 		    seterror(ERR_BADSUBST);
 		    break;
-		}	
+		}
 		while ((c = getC(0)) != (-1)) {
 		    *np++ = c;
 		    if(c == delim) delimcnt--;
@@ -877,7 +877,7 @@ dosub(sc, en, global)
 
     wdp = hp;
     while (--i >= 0) {
-	register struct wordent *new = 
+	register struct wordent *new =
 		(struct wordent *) xcalloc(1, sizeof *wdp);
 
 	new->word = 0;
diff --git a/bin/csh/parse.c b/bin/csh/parse.c
index 76f5911f0569..5d0632e092b7 100644
--- a/bin/csh/parse.c
+++ b/bin/csh/parse.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: parse.c,v 1.2 1994/09/24 02:54:11 davidg Exp $
  */
 
 #ifndef lint
@@ -52,19 +52,19 @@ static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 5/31/93";
 static void	 asyntax __P((struct wordent *, struct wordent *));
 static void	 asyn0 __P((struct wordent *, struct wordent *));
 static void	 asyn3 __P((struct wordent *, struct wordent *));
-static struct wordent 
+static struct wordent
 		*freenod __P((struct wordent *, struct wordent *));
-static struct command 
+static struct command
 		*syn0 __P((struct wordent *, struct wordent *, int));
-static struct command 
+static struct command
 		*syn1 __P((struct wordent *, struct wordent *, int));
-static struct command 
+static struct command
 		*syn1a __P((struct wordent *, struct wordent *, int));
-static struct command 
+static struct command
 		*syn1b __P((struct wordent *, struct wordent *, int));
-static struct command 
+static struct command
 		*syn2 __P((struct wordent *, struct wordent *, int));
-static struct command 
+static struct command
 		*syn3 __P((struct wordent *, struct wordent *, int));
 
 #define ALEFT	21		/* max of 20 alias expansions	 */
diff --git a/bin/csh/sem.c b/bin/csh/sem.c
index 5c7093aac682..8216d5590d2a 100644
--- a/bin/csh/sem.c
+++ b/bin/csh/sem.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: sem.c,v 1.2 1994/09/24 02:54:15 davidg Exp $
  */
 
 #ifndef lint
@@ -438,7 +438,7 @@ execute(t, wanttty, pipein, pipeout)
     }
     /*
      * Fall through for all breaks from switch
-     * 
+     *
      * If there will be no more executions of this command, flush all file
      * descriptors. Places that turn on the F_REPEAT bit are responsible for
      * doing donefds after the last re-execution
@@ -476,7 +476,7 @@ int i;
  *
  * I don't know what is best to do. I think that Ambiguous is better
  * than restructuring the command vector, because the user can get
- * unexpected results. In any case, the command vector restructuring 
+ * unexpected results. In any case, the command vector restructuring
  * code is present and the user can choose it by setting noambiguous
  */
 static Char *
diff --git a/bin/csh/set.c b/bin/csh/set.c
index 7f1d08da8f3f..7d03ac97772b 100644
--- a/bin/csh/set.c
+++ b/bin/csh/set.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: set.c,v 1.2 1994/09/24 02:54:16 davidg Exp $
  */
 
 #ifndef lint
@@ -664,7 +664,7 @@ exportpath(val)
 			       "Warning: ridiculously long PATH truncated\n");
 		break;
 	    }
-	    if ((**val != '/' || **val == '\0') && (euid == 0 || uid == 0)) 
+	    if ((**val != '/' || **val == '\0') && (euid == 0 || uid == 0))
 		    (void) fprintf(csherr,
 		    "Warning: exported path contains relative components.\n");
 	    (void) Strcat(exppath, *val++);
diff --git a/bin/csh/str.c b/bin/csh/str.c
index 4f4def5b7724..d30b95ef7bad 100644
--- a/bin/csh/str.c
+++ b/bin/csh/str.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: str.c,v 1.2 1994/09/24 02:54:18 davidg Exp $
  */
 
 #ifndef lint
@@ -449,21 +449,21 @@ vis_str(cp)
 
     if (cp == NULL)
 	return (NULL);
-    
+
     for (dp = cp; *dp++;)
 	continue;
     n = ((dp - cp) << 2) + 1; /* 4 times + NULL */
     if (dstsize < n) {
-	sdst = (char *) (dstsize ? 
+	sdst = (char *) (dstsize ?
 			    xrealloc(sdst, (size_t) n * sizeof(char)) :
 			    xmalloc((size_t) n * sizeof(char)));
 	dstsize = n;
     }
-    /* 
+    /*
      * XXX: When we are in AsciiOnly we want all characters >= 0200 to
      * be encoded, but currently there is no way in vis to do that.
      */
     (void) strvis(sdst, short2str(cp), VIS_NOSLASH);
     return (sdst);
 }
-    
+
diff --git a/bin/csh/time.c b/bin/csh/time.c
index c63e0f5920d7..95de7d2b444b 100644
--- a/bin/csh/time.c
+++ b/bin/csh/time.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: time.c,v 1.3 1995/02/16 09:17:27 jkh Exp $
+ *	$Id: time.c,v 1.4 1995/03/19 13:28:12 joerg Exp $
  */
 
 #ifndef lint
@@ -180,7 +180,7 @@ prusage(r0, r1, e, b)
 		break;
 
 	    case 'X':		/* (average) shared text size */
-		(void) fprintf(cshout, "%ld", t == 0 ? 0L : 
+		(void) fprintf(cshout, "%ld", t == 0 ? 0L :
 			       (r1->ru_ixrss - r0->ru_ixrss) / t);
 		break;