Cleanup from vodz

diff --git a/ash.c b/ash.c
index d16da82db62f683e8c8ff385e87d6cdf66d6422a..abacbf20ca644cc19534fef00d90832ce6f81c6b 100644 (file)
--- 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 d16da82db62f683e8c8ff385e87d6cdf66d6422a..abacbf20ca644cc19534fef00d90832ce6f81c6b 100644 (file)
--- 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)
 {