summaryrefslogtreecommitdiffstats
path: root/bin/sh/expand.c
diff options
context:
space:
mode:
Diffstat (limited to 'bin/sh/expand.c')
-rw-r--r--bin/sh/expand.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index f087f54..e980589 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -893,7 +893,7 @@ numvar:
}
/* FALLTHROUGH */
case '*':
- if (ifsset() != 0)
+ if (ifsset())
sep = ifsval()[0];
else
sep = ' ';
@@ -1022,8 +1022,7 @@ ifsbreakup(char *string, struct arglist *arglist)
p++;
}
} while ((ifsp = ifsp->next) != NULL);
- if (*start || (!ifsspc && start > string &&
- (nulonly || 1))) {
+ if (*start || (!ifsspc && start > string)) {
sp = (struct strlist *)stalloc(sizeof *sp);
sp->text = start;
*arglist->lastp = sp;
@@ -1211,7 +1210,6 @@ expmeta(char *enddir, char *name)
scopy(dp->d_name, enddir);
addfname(expdir);
} else {
- char *q;
for (p = enddir, q = dp->d_name;
(*p++ = *q++) != '\0';)
continue;
OpenPOWER on IntegriCloud