diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-05-12 08:11:27 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-05-12 08:11:27 +0100 |
| commit | 7c8c7681a9c8fac1fb8cf77f5950d32885ebb08c (patch) | |
| tree | 4e21c0c676bc424ba10e616d9f97de76bfe4409c /libbb | |
| parent | f637f37e0bd2e295936a7b4836676846693219aa (diff) | |
| parent | 1099a27696cd733041db97f99da4e22ecd2424e5 (diff) | |
| download | busybox-w32-7c8c7681a9c8fac1fb8cf77f5950d32885ebb08c.tar.gz busybox-w32-7c8c7681a9c8fac1fb8cf77f5950d32885ebb08c.tar.bz2 busybox-w32-7c8c7681a9c8fac1fb8cf77f5950d32885ebb08c.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/appletlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 9e415610d..99f0cb89c 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
| @@ -849,7 +849,7 @@ get_script_content(unsigned n) | |||
| 849 | //usage:#define busybox_trivial_usage NOUSAGE_STR | 849 | //usage:#define busybox_trivial_usage NOUSAGE_STR |
| 850 | //usage:#define busybox_full_usage "" | 850 | //usage:#define busybox_full_usage "" |
| 851 | //applet:IF_BUSYBOX(IF_FEATURE_SH_STANDALONE(IF_FEATURE_TAB_COMPLETION(APPLET(busybox, BB_DIR_BIN, BB_SUID_MAYBE)))) | 851 | //applet:IF_BUSYBOX(IF_FEATURE_SH_STANDALONE(IF_FEATURE_TAB_COMPLETION(APPLET(busybox, BB_DIR_BIN, BB_SUID_MAYBE)))) |
| 852 | int busybox_main(int argc, char *argv[]) MAIN_EXTERNALLY_VISIBLE; | 852 | int busybox_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 853 | # else | 853 | # else |
| 854 | # define busybox_main(argc,argv) busybox_main(argv) | 854 | # define busybox_main(argc,argv) busybox_main(argv) |
| 855 | static | 855 | static |