commit 6be163b167e986b4fafda9290e5d74fc3945b273
author The Android Open Source Project <initial-contribution@android.com> Fri Jun 04 08:00:52 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri Jun 04 08:00:52 2010 -0700
tree d4d47b3a2ddacfb9da4dd026ceb23dd617abb13d
parent 324a98f1901fb84ec4c88196e01c3e14c2b5a4a4
parent ad5431d2ca9c4dd454dfb3bc8e9de3ee0ad28a27

merge from open-source master

Change-Id: I8b1e7e238d9d0e828bea72530b5356b8386e48bc

sh/input.c

diff --git a/sh/input.c b/sh/input.c
index bfb80f4..056ee8b 100644
--- a/sh/input.c
+++ b/sh/input.c
@@ -175,6 +175,9 @@
 	return pgetc_macro();
 }
 
+int in_interactive_mode() {
+    return parsefile != NULL && parsefile->fd == 0;
+}
 
 static int
 preadfd(void)

sh/input.h

diff --git a/sh/input.h b/sh/input.h
index a9d3a12..99c1b77 100644
--- a/sh/input.h
+++ b/sh/input.h
@@ -46,6 +46,7 @@
 extern char *parsenextc;	/* next character in input buffer */
 extern int init_editline;	/* 0 == not setup, 1 == OK, -1 == failed */
 
+int in_interactive_mode();
 char *pfgets(char *, int);
 int pgetc(void);
 int preadbuffer(void);

sh/parser.c

diff --git a/sh/parser.c b/sh/parser.c
index d956375..faf0268 100644
--- a/sh/parser.c
+++ b/sh/parser.c
@@ -1629,9 +1629,9 @@
 	if (!el)
 #endif
 #ifdef WITH_LINENOISE
-#else
-		out2str(getprompt(NULL));
+        if (! in_interactive_mode() )
 #endif
+		out2str(getprompt(NULL));
 }
 
 /*