summary refs log tree commit diff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2014-10-27 15:39:39 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2014-10-27 15:39:39 +0800
commitc4d12c3f6424e801ccddda8894aad04d24333f82 (patch)
tree2ef8c4f81bdbf28335559073c7f8e7c6d0906e61
parent[BUILTIN] Handle embedded NULs correctly in printf (diff)
downloaddash-c4d12c3f6424e801ccddda8894aad04d24333f82.tar.gz
dash-c4d12c3f6424e801ccddda8894aad04d24333f82.zip
[INPUT] Replace open-coded flushall in preadbuffer
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--ChangeLog1
-rw-r--r--src/input.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 379672f..e6d6cbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Add printf support for format string a, A, and F.
 	* Handle embedded NULs correctly in printf.
+	* Replace open-coded flushall in preadbuffer.
 
 2014-10-13  Eric Blake <eblake@redhat.com>
 
diff --git a/src/input.c b/src/input.c
index 9e533a4..f11ac84 100644
--- a/src/input.c
+++ b/src/input.c
@@ -245,10 +245,7 @@ preadbuffer(void)
 	}
 	if (unlikely(parsenleft == EOF_NLEFT || parsefile->buf == NULL))
 		return PEOF;
-	flushout(&output);
-#ifdef FLUSHERR
-	flushout(&errout);
-#endif
+	flushall();
 
 	more = parselleft;
 	if (more <= 0) {