Apply fixes from upstream to prevent a crash and a usability issue:
- Fix type of read in prompt confirmation (eg. rmstar) (David Kaspar)
- Fix out of bounds read (Brooks Davis)
- Don't play pointer tricks that are undefined in modern c (Brooks Davis)
- Use `` instead $() for solaris, bleh.


(kim)

$NetBSD: patch-ed.chared.c,v 1.1 2016/12/24 13:18:43 kim Exp $

Fix out of bounds read (Brooks Davis)
(reproduce by starting tcsh and hitting tab at the prompt)

Index: ed.chared.c
===================================================================
RCS file: /p/tcsh/cvsroot/tcsh/ed.chared.c,v
retrieving revision 3.103
retrieving revision 3.104
diff -u -r3.103 -r3.104
--- ed.chared.c	19 Aug 2015 14:29:55 -0000	3.103
+++ ed.chared.c	2 Dec 2016 16:59:28 -0000	3.104
@@ -750,7 +750,7 @@
     /*
      * If we found a history character, go expand it.
      */
-    if (HIST != '\0' && *p == HIST)
+    if (p >= InputBuf && HIST != '\0' && *p == HIST)
 	nr_exp = c_excl(p);
     else
         nr_exp = 0;

$NetBSD: patch-nls-catgen,v 1.1 2016/12/24 13:18:43 kim Exp $

use `` instead $() for solaris, bleh.

Index: nls/catgen
===================================================================
RCS file: /p/tcsh/cvsroot/tcsh/nls/catgen,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nls/catgen	25 Jul 2014 14:45:25 -0000	1.4
+++ nls/catgen	26 Nov 2016 00:35:37 -0000	1.5
@@ -13,8 +13,8 @@
 shift
 CHARSET="$1"
 shift
-cat "${CHARSET}" $(sortit "$@") > "$TMP"
+cat "${CHARSET}" `sortit "$@"` > "$TMP"
 
-echo "$(basename "$OUT" .cat)"
+echo "`basename "$OUT" .cat`"
 "${GENCAT}" "$OUT" "$TMP"
 exit 0

$NetBSD: patch-sh.func.c,v 1.1 2016/12/24 13:18:43 kim Exp $

Fix type of read in prompt confirmation (eg. rmstar) (David Kaspar)

Index: sh.func.c
===================================================================
RCS file: /p/tcsh/cvsroot/tcsh/sh.func.c,v
retrieving revision 3.176
retrieving revision 3.177
diff -u -r3.176 -r3.177
--- sh.func.c	18 Oct 2016 17:26:42 -0000	3.176
+++ sh.func.c	28 Nov 2016 17:14:20 -0000	3.177
@@ -2734,16 +2734,18 @@
 int
 getYN(const char *prompt)
 {
-    int doit, c;
+    int doit;
+    char c;
+
     xprintf("%s", prompt);
     flush();
-    (void) force_read(SHIN, &c, 1);
+    (void) force_read(SHIN, &c, sizeof(c));
     /* 
      * Perhaps we should use the yesexpr from the
      * actual locale
      */
     doit = (strchr(CGETS(22, 14, "Yy"), c) != NULL);
-    while (c != '\n' && force_read(SHIN, &c, 1) == 1)
+    while (c != '\n' && force_read(SHIN, &c, sizeof(c)) == sizeof(c))
 	continue;
     return doit;
 }

$NetBSD: patch-tw.init.c,v 1.1 2016/12/24 13:18:43 kim Exp $

Don't play pointer tricks that are undefined in modern c (Brooks Davis)

Index: tw.init.c
===================================================================
RCS file: /p/tcsh/cvsroot/tcsh/tw.init.c,v
retrieving revision 3.42
retrieving revision 3.43
diff -u -r3.42 -r3.43
--- tw.init.c	17 Apr 2011 14:49:30 -0000	3.42
+++ tw.init.c	7 Dec 2016 02:52:27 -0000	3.43
@@ -125,9 +125,8 @@
 	sl->buff = xrealloc(sl->buff, sl->tbuff * sizeof(Char));
 	/* Re-thread the new pointer list, if changed */
 	if (ptr != NULL && ptr != sl->buff) {
-	    intptr_t offs = sl->buff - ptr;
 	    for (i = 0; i < sl->nlist; i++)
-		sl->list[i] += offs;
+		sl->list[i] = sl->buff + (sl->list[i] - ptr);
 	}
 	disabled_cleanup(&pintr_disabled);
     }