 @@ -1,35 +1,35 @@
-/*	$NetBSD: ex_script.c,v 1.8 2017/11/06 03:27:34 rin Exp $ */
+/*	$NetBSD: ex_script.c,v 1.9 2018/08/07 11:41:23 rin Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1992, 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Brian Hirt.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #include <sys/cdefs.h>
 #if 0
 #ifndef lint
 static const char sccsid[] = "Id: ex_script.c,v 10.38 2001/06/25 15:19:19 skimo Exp  (Berkeley) Date: 2001/06/25 15:19:19 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: ex_script.c,v 1.8 2017/11/06 03:27:34 rin Exp $");
+__RCSID("$NetBSD: ex_script.c,v 1.9 2018/08/07 11:41:23 rin Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/queue.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #include <sys/stat.h>
 #if defined(HAVE_SYS5_PTY)
 #include <sys/stropts.h>
 #endif
 #include <sys/time.h>
 @@ -252,84 +252,84 @@ sscr_getprompt(SCR *sp)
+ *
  * PUBLIC: int sscr_exec __P((SCR *, db_recno_t));
  */
 int
 sscr_exec(SCR *sp, db_recno_t lno)
+{
 	SCRIPT *sc;
 	db_recno_t last_lno;
 	size_t blen, len, last_len;
 	int isempty, matchprompt, rval;
 	ssize_t nw;
 	char *bp = NULL;
 	const char *p;
-	const CHAR_T *ip;
+	const CHAR_T *wp;
-	size_t ilen;
+	size_t wlen;
 	sc = sp->script;
 	/* If there's a prompt on the last line, append the command. */
 	if (db_last(sp, &last_lno))
 		return (1);
-	if (db_get(sp, last_lno, DBG_FATAL, __UNCONST(&ip), &ilen))
+	if (db_get(sp, last_lno, DBG_FATAL, __UNCONST(&wp), &wlen))
 		return (1);
-	INT2CHAR(sp, ip, ilen, p, last_len);
+	INT2CHAR(sp, wp, wlen, p, last_len);
 	if (last_len == sc->sh_prompt_len &&
 	    memcmp(p, sc->sh_prompt, last_len) == 0) {
 		matchprompt = 1;
 		GET_SPACE_RETC(sp, bp, blen, last_len + 128);
 		memmove(bp, p, last_len);
 	} else
 		matchprompt = 0;
 	/* Get something to execute. */
-	if (db_eget(sp, lno, __UNCONST(&ip), &ilen, &isempty)) {
+	if (db_eget(sp, lno, __UNCONST(&wp), &wlen, &isempty)) {
 		if (isempty)
 			goto empty;
 		goto err1;
+	}
 	/* Empty lines aren't interesting. */
-	if (ilen == 0)
+	if (wlen == 0)
 		goto empty;
-	INT2CHAR(sp, ip, ilen, p, len);
+	INT2CHAR(sp, wp, wlen, p, len);
 	/* Delete any prompt. */
 	if (len >= sc->sh_prompt_len &&
 	    memcmp(p, sc->sh_prompt, sc->sh_prompt_len) == 0) {
 		len -= sc->sh_prompt_len;
 		if (len == 0) {
 empty:			msgq(sp, M_BERR, "151|No command to execute");
 			goto err1;
+		}
 		p += sc->sh_prompt_len;
+	}
 	/* Push the line to the shell. */
 	if ((size_t)(nw = write(sc->sh_master, p, len)) != len)
 		goto err2;
 	rval = 0;
 	if (write(sc->sh_master, "\n", 1) != 1) {
 err2:		if (nw == 0)
 			errno = EIO;
 		msgq(sp, M_SYSERR, "shell");
 		goto err1;
+	}
 	if (matchprompt) {
 		ADD_SPACE_GOTO(sp, char, bp, blen, last_len + len);
 		memmove(bp + last_len, p, len);
-		CHAR2INT(sp, bp, last_len + len, ip, ilen);
+		CHAR2INT(sp, bp, last_len + len, wp, wlen);
-		if (db_set(sp, last_lno, ip, ilen))
+		if (db_set(sp, last_lno, wp, wlen))
 err1:			rval = 1;
+	}
 	if (matchprompt)
 alloc_err:	FREE_SPACE(sp, bp, blen);
 	return (rval);
+}
 /*
  * sscr_check_input -
  *	Check whether any input from shell or passed set.
+ *
  * PUBLIC: int sscr_check_input __P((SCR *sp, fd_set *rdfd, int maxfd));
  */
 @@ -422,95 +422,95 @@ loop:	maxfd = 0;
  *	Take a line from the shell and insert it into the file.
  */
 static int
 sscr_insert(SCR *sp)
+{
 	struct timeval tv;
 	char *endp, *p, *t;
 	SCRIPT *sc;
 	fd_set rdfd;
 	db_recno_t lno;
 	size_t len;
 	ssize_t nr;
 	char bp[1024];
-	const CHAR_T *ip;
+	const CHAR_T *wp;
-	size_t ilen = 0;
+	size_t wlen = 0;
 	/* Find out where the end of the file is. */
 	if (db_last(sp, &lno))
 		return (1);
 	endp = bp;
 	/* Read the characters. */
 	sc = sp->script;
 more:	switch (nr = read(sc->sh_master, endp, bp + sizeof(bp) - endp)) {
 	case  0:			/* EOF; shell just exited. */
 		sscr_end(sp);
 		return (0);
 	case -1:			/* Error or interrupt. */
 		msgq(sp, M_SYSERR, "shell");
 		return (1);
 	default:
 		endp += nr;
 		break;
+	}
 	/* Append the lines into the file. */
 	for (p = t = bp; p < endp; ++p) {
 		if (*p == '\r' || *p == '\n') {
 			len = p - t;
-			if (CHAR2INT(sp, t, len, ip, ilen) ||
+			if (CHAR2INT(sp, t, len, wp, wlen) ||
-			    db_append(sp, 1, lno++, ip, ilen))
+			    db_append(sp, 1, lno++, wp, wlen))
 				return (1);
 			t = p + 1;
+		}
+	}
 	/*
 	 * If the last thing from the shell isn't another prompt, wait up to
 	 * 1/10 of a second for more stuff to show up, so that we don't break
 	 * the output into two separate lines.  Don't want to hang indefinitely
 	 * because some program is hanging, confused the shell, or whatever.
 	 * Note that sc->sh_prompt can be NULL here.
 	 */
 	len = p - t;
 	if (sc->sh_prompt == NULL || len != sc->sh_prompt_len ||
 	    memcmp(t, sc->sh_prompt, len) != 0) {
 		tv.tv_sec = 0;
 		tv.tv_usec = 100000;
 		FD_ZERO(&rdfd);
 		FD_SET(sc->sh_master, &rdfd);
 		if (select(sc->sh_master + 1, &rdfd, NULL, NULL, &tv) == 1) {
 			if (len == sizeof(bp)) {
-				if (CHAR2INT(sp, t, len, ip, ilen) ||
+				if (CHAR2INT(sp, t, len, wp, wlen) ||
-				    db_append(sp, 1, lno++, ip, ilen))
+				    db_append(sp, 1, lno++, wp, wlen))
 					return (1);
 				endp = bp;
 			} else {
 				memmove(bp, t, len);
 				endp = bp + len;
+			}
 			goto more;
+		}
 		if (sscr_setprompt(sp, t, len))
 			return (1);
+	}
 	/* Append the remains into the file, and the cursor moves to EOF. */
 	if (len > 0) {
-		if (CHAR2INT(sp, t, len, ip, ilen) ||
+		if (CHAR2INT(sp, t, len, wp, wlen) ||
-		    db_append(sp, 1, lno++, ip, ilen))
+		    db_append(sp, 1, lno++, wp, wlen))
 			return (1);
-		sp->cno = ilen - 1;
+		sp->cno = wlen - 1;
 	} else
 		sp->cno = 0;
 	sp->lno = lno;
 	return (vs_refresh(sp, 1));
+}
 /*
  * sscr_setprompt --
+ *
  * Set the prompt in external ("char") encoding.
+ *
  */
 static int