diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
| commit | b8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (patch) | |
| tree | 336d653df8387b9b1d3c6e46caa373c00cb9b2b2 /shell/ash.c | |
| parent | b15f68214da209b5b293039c09c00f490c0cc193 (diff) | |
| parent | 6062c0d19bc201cbeb61b8875598cdd7a14a5ae0 (diff) | |
| download | busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.gz busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.bz2 busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.zip | |
Merge busybox into merge
Fix merge conflict in miscutils/less.c.
Use exit_SUCCESS() where possible.
Diffstat (limited to 'shell/ash.c')
| -rw-r--r-- | shell/ash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index ad1e5ba7e..09659c1da 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -6132,7 +6132,7 @@ openhere(union node *redir) | |||
| 6132 | ignoresig(SIGTSTP); //signal(SIGTSTP, SIG_IGN); | 6132 | ignoresig(SIGTSTP); //signal(SIGTSTP, SIG_IGN); |
| 6133 | signal(SIGPIPE, SIG_DFL); | 6133 | signal(SIGPIPE, SIG_DFL); |
| 6134 | xwrite(pip[1], p, len); | 6134 | xwrite(pip[1], p, len); |
| 6135 | _exit(EXIT_SUCCESS); | 6135 | _exit_SUCCESS(); |
| 6136 | } | 6136 | } |
| 6137 | #endif | 6137 | #endif |
| 6138 | out: | 6138 | out: |
| @@ -15860,7 +15860,7 @@ forkshell_openhere(struct forkshell *fs) | |||
| 15860 | ignoresig(SIGTSTP); //signal(SIGTSTP, SIG_IGN); | 15860 | ignoresig(SIGTSTP); //signal(SIGTSTP, SIG_IGN); |
| 15861 | signal(SIGPIPE, SIG_DFL); | 15861 | signal(SIGPIPE, SIG_DFL); |
| 15862 | xwrite(pip[1], p, len); | 15862 | xwrite(pip[1], p, len); |
| 15863 | _exit(EXIT_SUCCESS); | 15863 | _exit_SUCCESS(); |
| 15864 | } | 15864 | } |
| 15865 | 15865 | ||
| 15866 | static void | 15866 | static void |