 @@ -1,29 +1,30 @@
-#	$NetBSD: Makefile,v 1.35 2013/01/22 22:40:31 christos Exp $
+#	$NetBSD: Makefile,v 1.36 2013/01/23 16:39:03 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
+#
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
+#
 # To profile, put -DPROF in DFLAGS and -pg in COPTS, and recompile.
 .include <bsd.own.mk>
 PROG=	csh
 DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS
-# - Not integrated with history
+# - Editor history not always aligned with shell history,
 #   should implement internally
 # - Does not handle escaped prompts.
 # - Does not do completion
-# DFLAGS+=-DEDIT
+DFLAGS+=-DEDIT
 CPPFLAGS+=-I${.CURDIR} -I. ${DFLAGS}
 SRCS=	alloc.c char.c const.c csh.c dir.c dol.c err.c exec.c exp.c file.c \
 	func.c glob.c hist.c init.c lex.c misc.c parse.c printf.c proc.c \
 	sem.c set.c str.c time.c
 .PATH:	${NETBSDSRCDIR}/usr.bin/printf
 MLINKS=	csh.1 limit.1 csh.1 alias.1 csh.1 bg.1 csh.1 dirs.1 csh.1 fg.1 \
 	csh.1 foreach.1 csh.1 history.1 csh.1 jobs.1 csh.1 popd.1 \
 	csh.1 pushd.1 csh.1 rehash.1 csh.1 repeat.1 csh.1 suspend.1 \
 	csh.1 stop.1 csh.1 source.1
 DPSRCS+=	errnum.h const.h
 CLEANFILES+=	errnum.h const.h
 @@ -50,23 +51,23 @@ const.h: const.c
 .if make(install)
 SUBDIR+=USD.doc
 .endif
 # XXX Only GCC 4.1 problem
 .if defined(HAVE_GCC) && ${HAVE_GCC} == 4 && ${MACHINE_ARCH} == "vax"
 COPTS.parse.c+=	-O0
 .endif
 COPTS.err.c = -Wno-format-nonliteral
 COPTS.printf.c = -Wno-format-nonliteral
 COPTS.proc.c = -Wno-format-nonliteral
-.if 0
+.if !empty(DFLAGS:M*EDIT)
 LDADD+=-ledit -lutil
 DPADD+=${LIBEDIT} ${LIBUTIL}
 .else
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 .endif
 .include <bsd.prog.mk>
 .include <bsd.subdir.mk>

 @@ -1,14 +1,14 @@
-/* $NetBSD: csh.c,v 1.44 2013/01/22 20:35:29 christos Exp $ */
+/* $NetBSD: csh.c,v 1.45 2013/01/23 16:39:03 christos Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)csh.c	8.2 (Berkeley) 10/12/93";
 #else
-__RCSID("$NetBSD: csh.c,v 1.44 2013/01/22 20:35:29 christos Exp $");
+__RCSID("$NetBSD: csh.c,v 1.45 2013/01/23 16:39:03 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <locale.h>
 #include <paths.h>	/* should this be included in pathnames.h instead? */
 #include <pwd.h>
 #include <stdarg.h>
 @@ -68,27 +68,27 @@ __RCSID("$NetBSD: csh.c,v 1.44 2013/01/2
  * C Shell
+ *
  * Bill Joy, UC Berkeley, California, USA
  * October 1978, May 1980
+ *
  * Jim Kulp, IIASA, Laxenburg, Austria
  * April 1980
+ *
  * Christos Zoulas, Cornell University
  * June, 1991
  */
 Char *dumphist[] = {STRhistory, STRmh, 0, 0};
-Char *loadhist[] = {STRsource, STRmh, STRtildothist, 0};
+Char *tildehist[] = {STRsource, STRmh, STRtildothist, 0};
 int nofile = 0;
 int batch = 0;
 int enterhist = 0;
 int fast = 0;
 int mflag = 0;
 int nexececho = 0;
 int nverbose = 0;
 int prompt = 1;
 int quitit = 0;
 int reenter = 0;
 extern char **environ;
 @@ -532,28 +532,28 @@ notty:
 #endif
 	    (void)sigprocmask(SIG_SETMASK, &osigset, NULL);
 	    setintr = osetintr;
 	    parintr = oparintr;
+	}
 	(void)srccat(value(STRhome), STRsldotcshrc);
 	if (!fast && !arginp && !onelflg && !havhash)
 	    dohash(NULL, NULL);
 	/*
 	 * Source history before .login so that it is available in .login
 	 */
 	if ((cp = value(STRhistfile)) != STRNULL)
-	    loadhist[2] = cp;
+	    tildehist[2] = cp;
-	dosource(loadhist, NULL);
+	dosource(tildehist, NULL);
         if (loginsh)
 	      (void)srccat(value(STRhome), STRsldotlogin);
+    }
     /*
      * Now are ready for the -v and -x flags
      */
     if (nverbose)
 	setNS(STRverbose);
     if (nexececho)
 	setNS(STRecho);
     /*

 @@ -1,14 +1,14 @@
-/* $NetBSD: csh.h,v 1.24 2013/01/22 22:40:31 christos Exp $ */
+/* $NetBSD: csh.h,v 1.25 2013/01/23 16:39:03 christos Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -542,17 +542,18 @@ Char *word_chars;
 Char *STR_SHELLPATH;
 #include <paths.h>
 #ifdef _PATH_BSHELL
 Char *STR_BSHELL;
 #endif
 Char *STR_WORD_CHARS;
 Char **STR_environ;
 #ifdef EDIT
 #include <histedit.h>
 EditLine *el;
 History *hi;
 #endif
 int editing;
 #endif /* !_CSH_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: extern.h,v 1.27 2013/01/22 20:35:29 christos Exp $ */
+/* $NetBSD: extern.h,v 1.28 2013/01/23 16:39:03 christos Exp $ */
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -165,40 +165,46 @@ void ginit(void);
 Char **globall(Char **);
 void rscan(Char **, void (*)(int));
 void tglob(Char **);
 void trim(Char **);
 #ifdef FILEC
 int sortscmp(const ptr_t, const ptr_t);
 #endif /* FILEC */
 /*
  * hist.c
  */
 void dohist(Char **, struct command *);
 struct Hist *enthist(int, struct wordent *, int);
 #ifdef EDIT
 void loadhist(struct Hist *);
 #endif
 void savehist(struct wordent *);
 /*
  * lex.c
  */
 void addla(Char *);
 void bseek(struct Ain *);
 void btell(struct Ain *);
 void btoeof(void);
 void copylex(struct wordent *, struct wordent *);
 Char *domod(Char *, int);
 void freelex(struct wordent *);
 int lex(struct wordent *);
 void prlex(FILE *, struct wordent *);
 #ifdef EDIT
 int sprlex(char **, struct wordent *);
 #endif
 int readc(int);
 void settell(void);
 void unreadc(int);
 /*
  * misc.c
  */
 int any(const char *, int);
 Char **blkcat(Char **, Char **);
 Char **blkcpy(Char **, Char **);
 Char **blkend(Char **);
 void blkfree(Char **);
 int blklen(Char **);

 @@ -1,14 +1,14 @@
-/* $NetBSD: hist.c,v 1.18 2007/07/16 18:26:10 christos Exp $ */
+/* $NetBSD: hist.c,v 1.19 2013/01/23 16:39:03 christos Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: hist.c,v 1.18 2007/07/16 18:26:10 christos Exp $");
+__RCSID("$NetBSD: hist.c,v 1.19 2013/01/23 16:39:03 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include "csh.h"
 #include "extern.h"
 static void hfree(struct Hist *);
 static void dohist1(struct Hist *, int *, int, int);
 @@ -72,31 +72,55 @@ savehist(struct wordent *sp)
 		break;
+	    }
 	    histlen = histlen * 10 + *p++ - '0';
+	}
+    }
     for (hp = &Histlist; (np = hp->Hnext) != NULL;)
 	if (eventno - np->Href >= histlen || histlen == 0)
 	    hp->Hnext = np->Hnext, hfree(np);
 	else
 	    hp = np;
     (void) enthist(++eventno, sp, 1);
+}
 #ifdef EDIT
 void
 loadhist(struct Hist *hp) {
     char *h = NULL;
     if (hi == NULL || hp == NULL)
 	return;
     loadhist(hp->Hnext);
     if (sprlex(&h, &hp->Hlex) != -1) {
 	HistEvent ev;
 	history(hi, &ev, H_ENTER, h);
+    }
+}
 #endif
 struct Hist *
 enthist(int event, struct wordent *lp, int docopy)
+{
     struct Hist *np;
 #ifdef EDIT
     if (hi) {
 	char *h = NULL;
 	if (sprlex(&h, lp) != -1) {
 	    HistEvent ev;
 	    history(hi, &ev, H_ENTER, h);
+	}
+    }
 #endif
     np = (struct Hist *)xmalloc((size_t)sizeof(*np));
     np->Hnum = np->Href = event;
     if (docopy) {
 	copylex(&np->Hlex, lp);
+    }
     else {
 	np->Hlex.next = lp->next;
 	lp->next->prev = &np->Hlex;
 	np->Hlex.prev = lp->prev;
 	lp->prev->next = &np->Hlex;
+    }
     np->Hnext = Histlist.Hnext;
     Histlist.Hnext = np;

 @@ -1,14 +1,14 @@
-/* $NetBSD: lex.c,v 1.28 2013/01/22 20:35:29 christos Exp $ */
+/* $NetBSD: lex.c,v 1.29 2013/01/23 16:39:03 christos Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)lex.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: lex.c,v 1.28 2013/01/22 20:35:29 christos Exp $");
+__RCSID("$NetBSD: lex.c,v 1.29 2013/01/23 16:39:03 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
 @@ -178,26 +178,56 @@ prlex(FILE *fp, struct wordent *sp0)
     struct wordent *sp;
     sp = sp0->next;
     for (;;) {
 	(void)fprintf(fp, "%s", vis_str(sp->word));
 	sp = sp->next;
 	if (sp == sp0)
 	    break;
 	if (sp->word[0] != '\n')
 	    (void) fputc(' ', fp);
+    }
+}
 #ifdef EDIT
 int
 sprlex(char **s, struct wordent *sp0)
+{
     struct wordent *sp;
     sp = sp0->next;
     char *os = *s;
     for (;;) {
 	char *w = vis_str(sp->word);
 	if (os == NULL) {
 	    if (asprintf(s, "%s", w) < 0)
 		return -1;
 	    os = *s;
 	} else if (*os != '\n') {
 	    if (asprintf(s, "%s %s", os, w) < 0) {
 		free(os);
 		return 1;
+	    }
 	    free(os);
 	    os = *s;
+	}
 	sp = sp->next;
 	if (sp == sp0)
 	    break;
+    }
     return 0;
+}
 #endif
 void
 copylex(struct wordent *hp, struct wordent *fp)
+{
     struct wordent *wdp;
     wdp = hp;
     fp = fp->next;
     do {
 	struct wordent *new;
 	new = (struct wordent *)xmalloc((size_t)sizeof(*wdp));
 	new->prev = wdp;
 	new->next = hp;

 @@ -1,14 +1,14 @@
-/* $NetBSD: set.c,v 1.30 2013/01/22 20:35:29 christos Exp $ */
+/* $NetBSD: set.c,v 1.31 2013/01/23 16:39:03 christos Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)set.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: set.c,v 1.30 2013/01/22 20:35:29 christos Exp $");
+__RCSID("$NetBSD: set.c,v 1.31 2013/01/23 16:39:03 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #ifndef SHORT_STRINGS
 #include <string.h>
 #endif /* SHORT_STRINGS */
 #include "csh.h"
 @@ -166,31 +166,36 @@ doset(Char **v, struct command *t)
 	    /* and now mirror home with HOME */
 	    Setenv(STRHOME, cp);
 	    /* fix directory stack for new tilde home */
 	    dtilde();
 	    xfree((ptr_t)cp);
+	}
 #ifdef FILEC
 	else if (eq(vp, STRfilec))
 	    filec = 1;
 #endif
 #ifdef EDIT
 	else if (eq(vp, STRedit)) {
-		editing = 1;
+	    HistEvent ev;
-		el = el_init_fd(getprogname(), cshin, cshout, csherr,
+	    editing = 1;
-		    SHIN, SHOUT, SHERR);
+	    el = el_init_fd(getprogname(), cshin, cshout, csherr,
-		el_set(el, EL_EDITOR, "emacs");
+		SHIN, SHOUT, SHERR);
-		el_set(el, EL_PROMPT, printpromptstr);
+	    el_set(el, EL_EDITOR, "emacs");
 	    el_set(el, EL_PROMPT, printpromptstr);
 	    hi = history_init();
 	    history(hi, &ev, H_SETSIZE, getn(value(STRhistory)));
 	    loadhist(Histlist.Hnext);
 	    el_set(el, EL_HIST, history, hi);
+	}
 #endif
     } while ((p = *v++) != NULL);
+}
 static Char *
 getinx(Char *cp, int *ip)
+{
     *ip = 0;
     *cp++ = 0;
     while (*cp && Isdigit(*cp))
 	*ip = *ip * 10 + *cp++ - '0';
     if (*cp++ != ']')
 @@ -506,27 +511,29 @@ unset(Char **v, struct command *t)
     if (adrof(STRhistchars) == 0) {
 	HIST = '!';
 	HISTSUB = '^';
+    }
     else if (adrof(STRwordchars) == 0)
 	word_chars = STR_WORD_CHARS;
 #ifdef FILEC
     else if (adrof(STRfilec) == 0)
 	filec = 0;
 #endif
 #ifdef EDIT
     else if (adrof(STRedit) == 0) {
 	el_end(el);
 	history_end(hi);
 	el = NULL;
 	hi = NULL;
 	editing = 0;
+    }
 #endif
+}
 void
 unset1(Char *v[], struct varent *head)
+{
     struct varent *vp;
     int cnt;
     while (*++v) {
 	cnt = 0;