diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-03-20 22:17:13 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-03-20 22:17:13 +0000 |
commit | 83518d18a34a3ddfcaac1739930d8469f5bc2442 (patch) | |
tree | 2af665365a69f2689288cc13bb65efbb59e7d520 /include/libbb.h | |
parent | 0b28103cc774eb1ee62362cf61d52c32d44ec2cf (diff) | |
download | busybox-w32-83518d18a34a3ddfcaac1739930d8469f5bc2442.tar.gz busybox-w32-83518d18a34a3ddfcaac1739930d8469f5bc2442.tar.bz2 busybox-w32-83518d18a34a3ddfcaac1739930d8469f5bc2442.zip |
Compatibility fixes:
grep: support -z
find: support --mindepth
together +45 bytes
cpio: support -p (configurable, +230 bytes)
libbb: tweaks for cpio
Diffstat (limited to 'include/libbb.h')
-rw-r--r-- | include/libbb.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/libbb.h b/include/libbb.h index 8ea493b18..a2042fe5c 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -797,9 +797,9 @@ int run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char ** | |||
797 | * Both of the above will redirect fd 0,1,2 to /dev/null and drop ctty | 797 | * Both of the above will redirect fd 0,1,2 to /dev/null and drop ctty |
798 | * (will do setsid()). | 798 | * (will do setsid()). |
799 | * | 799 | * |
800 | * forkexit_or_rexec(argv) = bare-bones "fork + parent exits" on MMU, | 800 | * fork_or_rexec(argv) = bare-bones "fork" on MMU, |
801 | * "vfork + re-exec ourself" on NOMMU. No fd redirection, no setsid(). | 801 | * "vfork + re-exec ourself" on NOMMU. No fd redirection, no setsid(). |
802 | * Currently used for setsid only. On MMU ignores argv. | 802 | * On MMU ignores argv. |
803 | * | 803 | * |
804 | * Helper for network daemons in foreground mode: | 804 | * Helper for network daemons in foreground mode: |
805 | * | 805 | * |
@@ -813,14 +813,14 @@ enum { | |||
813 | DAEMON_ONLY_SANITIZE = 8, /* internal use */ | 813 | DAEMON_ONLY_SANITIZE = 8, /* internal use */ |
814 | }; | 814 | }; |
815 | #if BB_MMU | 815 | #if BB_MMU |
816 | void forkexit_or_rexec(void) FAST_FUNC; | 816 | pid_t fork_or_rexec(void) FAST_FUNC; |
817 | enum { re_execed = 0 }; | 817 | enum { re_execed = 0 }; |
818 | # define forkexit_or_rexec(argv) forkexit_or_rexec() | 818 | # define fork_or_rexec(argv) fork_or_rexec() |
819 | # define bb_daemonize_or_rexec(flags, argv) bb_daemonize_or_rexec(flags) | 819 | # define bb_daemonize_or_rexec(flags, argv) bb_daemonize_or_rexec(flags) |
820 | # define bb_daemonize(flags) bb_daemonize_or_rexec(flags, bogus) | 820 | # define bb_daemonize(flags) bb_daemonize_or_rexec(flags, bogus) |
821 | #else | 821 | #else |
822 | void re_exec(char **argv) NORETURN FAST_FUNC; | 822 | void re_exec(char **argv) NORETURN FAST_FUNC; |
823 | void forkexit_or_rexec(char **argv) FAST_FUNC; | 823 | pid_t fork_or_rexec(char **argv) FAST_FUNC; |
824 | extern bool re_execed; | 824 | extern bool re_execed; |
825 | int BUG_fork_is_unavailable_on_nommu(void) FAST_FUNC; | 825 | int BUG_fork_is_unavailable_on_nommu(void) FAST_FUNC; |
826 | int BUG_daemon_is_unavailable_on_nommu(void) FAST_FUNC; | 826 | int BUG_daemon_is_unavailable_on_nommu(void) FAST_FUNC; |