From 37ded2819b7f5f6338dfa04f21a12cc743cb092d Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 6 Sep 2001 17:59:36 +0000 Subject: [PATCH] define IFS_BROKEN --- busybox/ash.c | 19 ++++++++++--------- busybox/shell/ash.c | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/busybox/ash.c b/busybox/ash.c index f84fabb8b..c0d47559d 100644 --- a/busybox/ash.c +++ b/busybox/ash.c @@ -79,6 +79,7 @@ /* These are here to work with glibc -- Don't change these... */ #undef FNMATCH_BROKEN #undef GLOB_BROKEN +#define IFS_BROKEN #include #include @@ -9537,6 +9538,14 @@ command() { n1 = NULL; rpp = &redir; + /* Check for redirection which may precede command */ + while (readtoken() == TREDIR) { + *rpp = n2 = redirnode; + rpp = &n2->nfile.next; + parsefname(); + } + tokpushback++; + switch (readtoken()) { case TIF: n1 = (union node *)stalloc(sizeof (struct nif)); @@ -9750,14 +9759,6 @@ simplecmd() { redir = NULL; rpp = &redir; - /* Check for redirection which may precede command */ - while (readtoken() == TREDIR) { - *rpp = n2 = redirnode; - rpp = &n2->nfile.next; - parsefname(); - } - tokpushback++; - checkalias = 2; for (;;) { switch (readtoken()) { @@ -12792,7 +12793,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.17.2.2 2001/09/06 17:39:23 andersen Exp $ + * $Id: ash.c,v 1.17.2.3 2001/09/06 17:59:36 andersen Exp $ */ static int timescmd (int argc, char **argv) { diff --git a/busybox/shell/ash.c b/busybox/shell/ash.c index f84fabb8b..c0d47559d 100644 --- a/busybox/shell/ash.c +++ b/busybox/shell/ash.c @@ -79,6 +79,7 @@ /* These are here to work with glibc -- Don't change these... */ #undef FNMATCH_BROKEN #undef GLOB_BROKEN +#define IFS_BROKEN #include #include @@ -9537,6 +9538,14 @@ command() { n1 = NULL; rpp = &redir; + /* Check for redirection which may precede command */ + while (readtoken() == TREDIR) { + *rpp = n2 = redirnode; + rpp = &n2->nfile.next; + parsefname(); + } + tokpushback++; + switch (readtoken()) { case TIF: n1 = (union node *)stalloc(sizeof (struct nif)); @@ -9750,14 +9759,6 @@ simplecmd() { redir = NULL; rpp = &redir; - /* Check for redirection which may precede command */ - while (readtoken() == TREDIR) { - *rpp = n2 = redirnode; - rpp = &n2->nfile.next; - parsefname(); - } - tokpushback++; - checkalias = 2; for (;;) { switch (readtoken()) { @@ -12792,7 +12793,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.17.2.2 2001/09/06 17:39:23 andersen Exp $ + * $Id: ash.c,v 1.17.2.3 2001/09/06 17:59:36 andersen Exp $ */ static int timescmd (int argc, char **argv) { -- 2.25.1