aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2022-02-09 11:24:33 +0000
committerRon Yorston <rmy@pobox.com>2022-02-09 11:24:33 +0000
commit7d5de438255f7571906a798bb6a3de80bd4c09d9 (patch)
tree5bf3fd97f37758777ef5806c52d66f912debd2e9
parent492d0a7492a57fe8f02c766e25960b0ce0d88759 (diff)
downloadbusybox-w32-7d5de438255f7571906a798bb6a3de80bd4c09d9.tar.gz
busybox-w32-7d5de438255f7571906a798bb6a3de80bd4c09d9.tar.bz2
busybox-w32-7d5de438255f7571906a798bb6a3de80bd4c09d9.zip
Fix POSIX build; new year
-rw-r--r--coreutils/timeout.c3
-rw-r--r--libbb/appletlib.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/coreutils/timeout.c b/coreutils/timeout.c
index 74df31d10..c8171ec54 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -42,7 +42,8 @@
42//usage: "[-s SIG] [-k KILL_SECS] SECS PROG ARGS" 42//usage: "[-s SIG] [-k KILL_SECS] SECS PROG ARGS"
43//usage:#define timeout_full_usage "\n\n" 43//usage:#define timeout_full_usage "\n\n"
44//usage: "Run PROG. Send SIG to it if it is not gone in SECS seconds.\n" 44//usage: "Run PROG. Send SIG to it if it is not gone in SECS seconds.\n"
45//usage: "Default SIG: TERM.\n" 45//usage: IF_NOT_PLATFORM_MINGW32("Default SIG: TERM.")
46//usage: IF_PLATFORM_MINGW32("Default SIG: TERM.\n")
46//usage: "If it still exists in KILL_SECS seconds, send KILL.\n" 47//usage: "If it still exists in KILL_SECS seconds, send KILL.\n"
47 48
48#include "libbb.h" 49#include "libbb.h"
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index a8b82e729..4a4699c68 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -831,7 +831,7 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
831 } 831 }
832#endif 832#endif
833 full_write2_str( 833 full_write2_str(
834 "BusyBox is copyrighted by many authors between 1998-2021.\n" 834 "BusyBox is copyrighted by many authors between 1998-2022.\n"
835 "Licensed under GPLv2. See source distribution for detailed\n" 835 "Licensed under GPLv2. See source distribution for detailed\n"
836 "copyright notices.\n" 836 "copyright notices.\n"
837 "\n" 837 "\n"