diff options
author | Ron Yorston <rmy@pobox.com> | 2016-10-26 10:42:51 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2016-10-26 10:42:51 +0100 |
commit | 8239357d4919047f4f8138857e26ce851f483f93 (patch) | |
tree | bab356b6640f30c7560356c9b8ed89ae57fd7acb /shell | |
parent | 94eac583b29d56a28bf18d41f56ecb2a9d0bd336 (diff) | |
download | busybox-w32-8239357d4919047f4f8138857e26ce851f483f93.tar.gz busybox-w32-8239357d4919047f4f8138857e26ce851f483f93.tar.bz2 busybox-w32-8239357d4919047f4f8138857e26ce851f483f93.zip |
Post-merge fix
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index a7b65ffc7..d2bbde2f7 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -14510,7 +14510,6 @@ globals_var_size(struct globals_var *gvp) | |||
14510 | nodeptrsize += 2 + VTABSIZE; /* gvp->redirlist, gvp->shellparam.p, vartab */ | 14510 | nodeptrsize += 2 + VTABSIZE; /* gvp->redirlist, gvp->shellparam.p, vartab */ |
14511 | } | 14511 | } |
14512 | 14512 | ||
14513 | #undef g_nullredirs | ||
14514 | #undef preverrout_fd | 14513 | #undef preverrout_fd |
14515 | static struct globals_var * | 14514 | static struct globals_var * |
14516 | globals_var_copy(struct globals_var *gvp) | 14515 | globals_var_copy(struct globals_var *gvp) |
@@ -14530,7 +14529,6 @@ globals_var_copy(struct globals_var *gvp) | |||
14530 | new->redirlist = redirtab_copy(gvp->redirlist); | 14529 | new->redirlist = redirtab_copy(gvp->redirlist); |
14531 | SAVE_PTR(new->redirlist); | 14530 | SAVE_PTR(new->redirlist); |
14532 | 14531 | ||
14533 | new->g_nullredirs = gvp->g_nullredirs; | ||
14534 | new->preverrout_fd = gvp->preverrout_fd; | 14532 | new->preverrout_fd = gvp->preverrout_fd; |
14535 | for (i = 0; i < VTABSIZE; i++) { | 14533 | for (i = 0; i < VTABSIZE; i++) { |
14536 | new->vartab[i] = var_copy(gvp->vartab[i]); | 14534 | new->vartab[i] = var_copy(gvp->vartab[i]); |