From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 17 Jul 2001 01:14:06 +0000 (-0000)
Subject: Cleanup from vodz
X-Git-Tag: 0_60_0~64
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc4c0300238c62c9daa8dcd8ac8eff028bf314a0;p=oweals%2Fbusybox.git

Cleanup from vodz
---

diff --git a/ash.c b/ash.c
index d16da82db..abacbf20c 100644
--- a/ash.c
+++ b/ash.c
@@ -6201,7 +6201,7 @@ preadfd(void)
 retry:
 #ifdef BB_FEATURE_COMMAND_EDITING
 	{
-	    if (!iflag)
+	    if (parsefile->fd)
 		    nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
 	    else {
 		    nr = cmdedit_read_input((char*)cmdedit_prompt, buf);
@@ -12916,7 +12916,7 @@ findvar(struct var **vpp, const char *name)
 /*
  * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
  * This file contains code for the times builtin.
- * $Id: ash.c,v 1.11 2001/07/17 01:12:35 andersen Exp $
+ * $Id: ash.c,v 1.12 2001/07/17 01:14:06 andersen Exp $
  */
 static int timescmd (int argc, char **argv)
 {
diff --git a/shell/ash.c b/shell/ash.c
index d16da82db..abacbf20c 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6201,7 +6201,7 @@ preadfd(void)
 retry:
 #ifdef BB_FEATURE_COMMAND_EDITING
 	{
-	    if (!iflag)
+	    if (parsefile->fd)
 		    nr = safe_read(parsefile->fd, buf, BUFSIZ - 1);
 	    else {
 		    nr = cmdedit_read_input((char*)cmdedit_prompt, buf);
@@ -12916,7 +12916,7 @@ findvar(struct var **vpp, const char *name)
 /*
  * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
  * This file contains code for the times builtin.
- * $Id: ash.c,v 1.11 2001/07/17 01:12:35 andersen Exp $
+ * $Id: ash.c,v 1.12 2001/07/17 01:14:06 andersen Exp $
  */
 static int timescmd (int argc, char **argv)
 {