From f5d85e22fb66502d2c600d91955e0498e8fd0f43 Mon Sep 17 00:00:00 2001 From: andersen Date: Tue, 17 Jul 2001 01:14:06 +0000 Subject: Cleanup from vodz git-svn-id: svn://busybox.net/trunk/busybox@3105 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- ash.c | 4 ++-- shell/ash.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 * 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 * 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) { -- cgit v1.2.3-55-g6feb