diff options
| author | Ron Yorston <rmy@pobox.com> | 2023-04-09 11:24:09 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2023-04-09 11:24:09 +0100 |
| commit | d9f2ea8628452f787e02dd0e496af612a2e94578 (patch) | |
| tree | c12be657e31c2e832b41fbff9a77aa0f886d47f0 /archival/cpio.c | |
| parent | fa04f2dc766c76f2caa44a4b8429185dde6a66b0 (diff) | |
| parent | a26711a2d1464167be4ebc990fe21a3809a2da34 (diff) | |
| download | busybox-w32-d9f2ea8628452f787e02dd0e496af612a2e94578.tar.gz busybox-w32-d9f2ea8628452f787e02dd0e496af612a2e94578.tar.bz2 busybox-w32-d9f2ea8628452f787e02dd0e496af612a2e94578.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'archival/cpio.c')
| -rw-r--r-- | archival/cpio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/archival/cpio.c b/archival/cpio.c index a642bbc35..388ba7c4f 100644 --- a/archival/cpio.c +++ b/archival/cpio.c | |||
| @@ -508,7 +508,6 @@ int cpio_main(int argc UNUSED_PARAM, char **argv) | |||
| 508 | goto dump; | 508 | goto dump; |
| 509 | } | 509 | } |
| 510 | /* parent */ | 510 | /* parent */ |
| 511 | USE_FOR_NOMMU(argv[-optind][0] &= 0x7f); /* undo fork_or_rexec() damage */ | ||
| 512 | xchdir(*argv++); | 511 | xchdir(*argv++); |
| 513 | close(pp.wr); | 512 | close(pp.wr); |
| 514 | xmove_fd(pp.rd, STDIN_FILENO); | 513 | xmove_fd(pp.rd, STDIN_FILENO); |