diff options
author | Ron Yorston <rmy@pobox.com> | 2023-07-13 08:06:26 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2023-07-13 08:06:26 +0100 |
commit | bd978d0256fd3a67de1a7dd54f1a37f9435be363 (patch) | |
tree | cb869384a533ac0d95fe787d75be6c050e1e7c1a /include/libbb.h | |
parent | b2901ce8efa050da00e0f3a73f3be9bf9402deea (diff) | |
parent | d70256a5c719439cc6fab6a4571c1bb46178e4c7 (diff) | |
download | busybox-w32-bd978d0256fd3a67de1a7dd54f1a37f9435be363.tar.gz busybox-w32-bd978d0256fd3a67de1a7dd54f1a37f9435be363.tar.bz2 busybox-w32-bd978d0256fd3a67de1a7dd54f1a37f9435be363.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'include/libbb.h')
-rw-r--r-- | include/libbb.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index 5c4a01e8d..ae10c3bf0 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -1345,6 +1345,8 @@ void set_task_comm(const char *comm) FAST_FUNC; | |||
1345 | #endif | 1345 | #endif |
1346 | void exit_SUCCESS(void) NORETURN FAST_FUNC; | 1346 | void exit_SUCCESS(void) NORETURN FAST_FUNC; |
1347 | void _exit_SUCCESS(void) NORETURN FAST_FUNC; | 1347 | void _exit_SUCCESS(void) NORETURN FAST_FUNC; |
1348 | void exit_FAILURE(void) NORETURN FAST_FUNC; | ||
1349 | void _exit_FAILURE(void) NORETURN FAST_FUNC; | ||
1348 | 1350 | ||
1349 | /* Helpers for daemonization. | 1351 | /* Helpers for daemonization. |
1350 | * | 1352 | * |
@@ -1575,6 +1577,8 @@ int hush_main(int argc, char** argv) IF_SHELL_HUSH(MAIN_EXTERNALLY_VISIBLE); | |||
1575 | /* If shell needs them, they exist even if not enabled as applets */ | 1577 | /* If shell needs them, they exist even if not enabled as applets */ |
1576 | int echo_main(int argc, char** argv) IF_ECHO(MAIN_EXTERNALLY_VISIBLE); | 1578 | int echo_main(int argc, char** argv) IF_ECHO(MAIN_EXTERNALLY_VISIBLE); |
1577 | int sleep_main(int argc, char **argv) IF_SLEEP(MAIN_EXTERNALLY_VISIBLE); | 1579 | int sleep_main(int argc, char **argv) IF_SLEEP(MAIN_EXTERNALLY_VISIBLE); |
1580 | /* See disabled "config ASH_SLEEP" in ash.c */ | ||
1581 | #define ENABLE_ASH_SLEEP 0 | ||
1578 | int printf_main(int argc, char **argv) IF_PRINTF(MAIN_EXTERNALLY_VISIBLE); | 1582 | int printf_main(int argc, char **argv) IF_PRINTF(MAIN_EXTERNALLY_VISIBLE); |
1579 | int test_main(int argc, char **argv) | 1583 | int test_main(int argc, char **argv) |
1580 | #if ENABLE_TEST || ENABLE_TEST1 || ENABLE_TEST2 | 1584 | #if ENABLE_TEST || ENABLE_TEST1 || ENABLE_TEST2 |