summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-07-17 01:14:06 +0000
committerEric Andersen2001-07-17 01:14:06 +0000
commitbc4c0300238c62c9daa8dcd8ac8eff028bf314a0 (patch)
treefb6be90efdbe334539e50f86684ce748d6d5f247
parent044228d5ecb9b79397f9fc915d046cf4538281e2 (diff)
downloadbusybox-bc4c0300238c62c9daa8dcd8ac8eff028bf314a0.zip
busybox-bc4c0300238c62c9daa8dcd8ac8eff028bf314a0.tar.gz
Cleanup from vodz
-rw-r--r--ash.c4
-rw-r--r--shell/ash.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ash.c b/ash.c
index d16da82..abacbf2 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 d16da82..abacbf2 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)
{