fix bug that can cause recursive .forward files to fail

[unix-history] / usr / src / bin / sh / input.c

diff --git a/usr/src/bin/sh/input.c b/usr/src/bin/sh/input.c
index b6b3559..77fb217 100644 (file)
--- a/usr/src/bin/sh/input.c
+++ b/usr/src/bin/sh/input.c
@@ -1,6 +1,6 @@
 /*-
 /*-

- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.


@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)input.c    5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)input.c    8.1 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -157,7 +157,6 @@ preadbuffer() {
        register int i;
        register int something;
        extern EditLine *el;
        register int i;
        register int something;
        extern EditLine *el;

-       extern int is_interactive;

 
        if (parsefile->strpush) {
                popstring();
 
        if (parsefile->strpush) {
                popstring();


@@ -171,7 +170,7 @@ preadbuffer() {
 retry:
        p = parsenextc = parsefile->buf;
        if (parsefile->fd == 0 && el) {
 retry:
        p = parsenextc = parsefile->buf;
        if (parsefile->fd == 0 && el) {

-               char *rl_cp;
+               const char *rl_cp;

                int len;
 
                rl_cp = el_gets(el, &len);
                int len;
 
                rl_cp = el_gets(el, &len);