Module Name: src
Committed By: christos
Date: Thu Apr 16 19:39:37 UTC 2009
Modified Files:
src/lib/libedit: prompt.c
Log Message:
PR/41230: -current: sh(1) endlessly looping in interactive
Fix proposed from Matthew Mondor
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libedit/prompt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/prompt.c
diff -u src/lib/libedit/prompt.c:1.14 src/lib/libedit/prompt.c:1.15
--- src/lib/libedit/prompt.c:1.14 Tue Mar 31 13:38:27 2009
+++ src/lib/libedit/prompt.c Thu Apr 16 15:39:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: prompt.c,v 1.14 2009/03/31 17:38:27 christos Exp $ */
+/* $NetBSD: prompt.c,v 1.15 2009/04/16 19:39:37 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)prompt.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: prompt.c,v 1.14 2009/03/31 17:38:27 christos Exp $");
+__RCSID("$NetBSD: prompt.c,v 1.15 2009/04/16 19:39:37 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -93,16 +93,16 @@
elp = &el->el_prompt;
else
elp = &el->el_rprompt;
- p = (elp->p_func) (el);
- while (*p) {
+
+ for (p = (*elp->p_func)(el); *p; p++) {
if (elp->p_ignore == *p) {
ignore = !ignore;
continue;
}
if (ignore)
- term__putc(el, *p++);
+ term__putc(el, *p);
else
- re_putc(el, *p++, 1);
+ re_putc(el, *p, 1);
}
elp->p_pos.v = el->el_refresh.r_cursor.v;
