Merge branch 'busybox' into merge

10 files changed, 87 insertions, 102 deletions

diff --git a/Makefile b/Makefile
index 30a24f68e..ae870ecb7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERSION = 1
-PATCHLEVEL = 37
+PATCHLEVEL = 38
 SUBLEVEL = 0
 EXTRAVERSION = .git
 NAME = Unnamed
diff --git a/editors/ed.c b/editors/ed.c
index e25179ddc..a02634ec7 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -345,10 +345,8 @@ static int insertLine(int num, const char *data, int len)
         lp->prev->next = newLp;
         lp->prev = newLp;
 
-#if ENABLE_PLATFORM_MINGW32
         if (num <= curNum)
                 curLine = curLine->prev;
-#endif
         lastNum++;
         dirty = TRUE;
         return setCurNum(num);
diff --git a/include/libbb.h b/include/libbb.h
index 17fb6fae6..b68f9b684 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -2092,11 +2092,11 @@ enum {
         FOR_SHELL        = DO_HISTORY | TAB_COMPLETION | USERNAME_COMPLETION | LI_INTERRUPTIBLE,
 };
 line_input_t *new_line_input_t(int flags) FAST_FUNC;
-#if ENABLE_FEATURE_EDITING_SAVEHISTORY
+# if ENABLE_FEATURE_EDITING_SAVEHISTORY
 void free_line_input_t(line_input_t *n) FAST_FUNC;
-#else
-# define free_line_input_t(n) free(n)
-#endif
+# else
+#  define free_line_input_t(n) free(n)
+# endif
 /*
  * maxsize must be >= 2.
  * Returns:
@@ -2107,7 +2107,7 @@ void free_line_input_t(line_input_t *n) FAST_FUNC;
 int read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize) FAST_FUNC;
 void show_history(const line_input_t *st) FAST_FUNC;
 # if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
-void save_history(line_input_t *st);
+void save_history(line_input_t *st) FAST_FUNC;
 # endif
 #else
 #define MAX_HISTORY 0
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 1ff7fe6c8..27ce8a6e8 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -144,17 +144,19 @@ static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
 void FAST_FUNC bb_show_usage(void)
 {
         if (ENABLE_SHOW_USAGE) {
+                ssize_t FAST_FUNC (*full_write_fn)(const char *) =
+                                xfunc_error_retval ? full_write2_str : full_write1_str;
 #ifdef SINGLE_APPLET_STR
                 /* Imagine that this applet is "true". Dont link in printf! */
                 const char *usage_string = unpack_usage_messages();
 
                 if (usage_string) {
                         if (*usage_string == '\b') {
-                                full_write2_str("No help available\n");
+                                full_write_fn("No help available\n");
                         } else {
-                                full_write2_str("Usage: "SINGLE_APPLET_STR" ");
-                                full_write2_str(usage_string);
-                                full_write2_str("\n");
+                                full_write_fn("Usage: "SINGLE_APPLET_STR" ");
+                                full_write_fn(usage_string);
+                                full_write_fn("\n");
                         }
                         if (ENABLE_FEATURE_CLEAN_UP)
                                 dealloc_usage_messages((char*)usage_string);
@@ -170,23 +172,23 @@ void FAST_FUNC bb_show_usage(void)
                         while (*p++) continue;
                         ap--;
                 }
-                full_write2_str(bb_banner);
+                full_write_fn(bb_banner);
 #if ENABLE_PLATFORM_MINGW32
-                full_write2_str("\n");
+                full_write_fn("\n");
 #else
-                full_write2_str(" multi-call binary.\n"); /* common string */
+                full_write_fn(" multi-call binary.\n"); /* common string */
 #endif
                 if (*p == '\b')
-                        full_write2_str("\nNo help available\n");
+                        full_write_fn("\nNo help available\n");
                 else {
-                        full_write2_str("\nUsage: ");
-                        full_write2_str(applet_name);
+                        full_write_fn("\nUsage: ");
+                        full_write_fn(applet_name);
                         if (p[0]) {
                                 if (p[0] != '\n')
-                                        full_write2_str(" ");
-                                full_write2_str(p);
+                                        full_write_fn(" ");
+                                full_write_fn(p);
                         }
-                        full_write2_str("\n");
+                        full_write_fn("\n");
                 }
                 if (ENABLE_FEATURE_CLEAN_UP)
                         dealloc_usage_messages((char*)usage_string);
@@ -371,8 +373,10 @@ void lbb_prepare(const char *applet
                  && !(ENABLE_TRUE && strcmp(applet_name, "true") == 0)
                  && !(ENABLE_FALSE && strcmp(applet_name, "false") == 0)
                  && !(ENABLE_ECHO && strcmp(applet_name, "echo") == 0)
-                )
+                ) {
+                        xfunc_error_retval = 0;
                         bb_show_usage();
+                }
         }
 #endif
 }
@@ -912,24 +916,23 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
  help:
                 output_width = get_terminal_width(2);
 
-                dup2(1, 2);
-                full_write2_str(bb_banner); /* reuse const string */
+                full_write1_str(bb_banner); /* reuse const string */
 #  if ENABLE_PLATFORM_MINGW32
-                full_write2_str("\n(");
+                full_write1_str("\n(");
 #   if defined(MINGW_VER)
                 if (sizeof(MINGW_VER) > 5) {
-                        full_write2_str(MINGW_VER "; ");
+                        full_write1_str(MINGW_VER "; ");
                 }
 #   endif
-                full_write2_str(ENABLE_GLOBBING ? "glob" : "noglob");
+                full_write1_str(ENABLE_GLOBBING ? "glob" : "noglob");
 #   if ENABLE_FEATURE_UTF8_MANIFEST
-                full_write2_str("; Unicode");
+                full_write1_str("; Unicode");
 #   endif
-                full_write2_str(")\n\n");
+                full_write1_str(")\n\n");
 #  else
-                full_write2_str(" multi-call binary.\n"); /* reuse */
+                full_write1_str(" multi-call binary.\n"); /* reuse */
 #endif
-                full_write2_str(
+                full_write1_str(
                         "BusyBox is copyrighted by many authors between 1998-2024.\n"
                         "Licensed under GPLv2. See source distribution for detailed\n"
                         "copyright notices.\n"
@@ -973,20 +976,20 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
                 while (*a) {
                         int len2 = strlen(a) + 2;
                         if (col >= (int)output_width - len2) {
-                                full_write2_str(",\n");
+                                full_write1_str(",\n");
                                 col = 0;
                         }
                         if (col == 0) {
                                 col = 6;
-                                full_write2_str("\t");
+                                full_write1_str("\t");
                         } else {
-                                full_write2_str(", ");
+                                full_write1_str(", ");
                         }
-                        full_write2_str(a);
+                        full_write1_str(a);
                         col += len2;
                         a += len2 - 1;
                 }
-                full_write2_str("\n");
+                full_write1_str("\n");
                 return 0;
         }
 
@@ -1006,11 +1009,10 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
         if (is_prefixed_with(argv[1], "--list")) {
                 unsigned i = 0;
                 const char *a = applet_names;
-                dup2(1, 2);
                 while (*a) {
 #  if ENABLE_FEATURE_INSTALLER && !ENABLE_PLATFORM_MINGW32
                         if (argv[1][6]) /* --list-full? */
-                                full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
+                                full_write1_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
 #  elif ENABLE_PLATFORM_MINGW32 && (ENABLE_FEATURE_PREFER_APPLETS \
                 || ENABLE_FEATURE_SH_STANDALONE \
                 || ENABLE_FEATURE_SH_NOFORK)
@@ -1027,12 +1029,12 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
 #   endif
                                 else
                                         str = "        ";
-                                full_write2_str(str);
-                                full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
+                                full_write1_str(str);
+                                full_write1_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
                         }
 #  endif
-                        full_write2_str(a);
-                        full_write2_str("\n");
+                        full_write1_str(a);
+                        full_write1_str("\n");
                         i++;
                         while (*a++ != '\0')
                                 continue;
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 7f26bb8e0..8e2b37853 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1653,12 +1653,7 @@ void FAST_FUNC show_history(const line_input_t *st)
         if (!st)
                 return;
         for (i = 0; i < st->cnt_history; i++)
-#if ENABLE_PLATFORM_MINGW32
-                /* Upstream erred, a patch has been submitted */
                 printf("%4d %s\n", i, st->history[i]);
-#else
-                fprintf(stderr, "%4d %s\n", i, st->history[i]);
-#endif
 }
 
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
@@ -1750,7 +1745,7 @@ static void load_history(line_input_t *st_parm)
 }
 
 #  if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
-void save_history(line_input_t *st)
+void FAST_FUNC save_history(line_input_t *st)
 {
         FILE *fp;
 
diff --git a/networking/wget.c b/networking/wget.c
index ae847044e..6a64836fb 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1218,7 +1218,9 @@ static void download_one_url(const char *url)
         /*G.content_len = 0; - redundant, got_clen = 0 is enough */
         G.got_clen = 0;
         G.chunked = 0;
-        if (use_proxy || target.protocol[0] != 'f' /*not ftp[s]*/) {
+        if (!ENABLE_FEATURE_WGET_FTP
+         || use_proxy || target.protocol[0] != 'f' /*not ftp[s]*/
+        ) {
                 /*
                  *  HTTP session
                  */
@@ -1500,14 +1502,15 @@ However, in real world it was observed that some web servers
 
                 /* For HTTP, data is pumped over the same connection */
                 dfp = sfp;
-        } else {
+        }
 #if ENABLE_FEATURE_WGET_FTP
+        else {
                 /*
                  *  FTP session
                  */
                 sfp = prepare_ftp_session(&dfp, &target, lsa);
-#endif
         }
+#endif
 
         free(lsa);
 
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 1ae25c919..47a0cee07 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -107,6 +107,7 @@
 #ifndef __MINGW32__
 #include <sys/mman.h>
 #endif
+#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
@@ -347,7 +348,10 @@ void do_config_file(char *filename)
                 perror(filename);
                 exit(2);
         }
-        fstat(fd, &st);
+        if (fstat(fd, &st) < 0) {
+                fprintf(stderr, "fixdep: fstat %s %s\n", filename, strerror(errno));
+                exit(2);
+        }
         if (st.st_size == 0) {
                 close(fd);
                 return;
@@ -425,7 +429,10 @@ void print_deps(void)
                 perror(depfile);
                 exit(2);
         }
-        fstat(fd, &st);
+        if (fstat(fd, &st) < 0) {
+                fprintf(stderr, "fixdep: fstat %s %s\n", depfile, strerror(errno));
+                exit(2);
+        }
         if (st.st_size == 0) {
                 fprintf(stderr,"fixdep: %s is empty\n",depfile);
                 close(fd);
diff --git a/shell/ash.c b/shell/ash.c
index 8bbc19d1f..8a3659542 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -12821,16 +12821,12 @@ options(int *login_sh)
                                 if (val && (c == '-')) { /* long options */
                                         if (strcmp(p, "login") == 0) {
                                                 *login_sh = 1;
-#if ENABLE_PLATFORM_MINGW32
                                                 break;
-#endif
                                         }
 /* TODO: --noprofile: e.g. if I want to run emergency shell from sulogin,
  * I want minimal/no shell init scripts - but it insists on running it as "-ash"...
  */
-#if !ENABLE_PLATFORM_MINGW32
-                                        break;
-#endif
+                                        ash_msg_and_raise_error("bad option '%s'", p - 2);
                                 }
                         }
                         if (c == 'o') {
diff --git a/shell/hush.c b/shell/hush.c
index 707b77c9c..6b6ec7c6b 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -390,7 +390,6 @@
 #define BASH_TEST2         (ENABLE_HUSH_BASH_COMPAT && ENABLE_HUSH_TEST)
 #define BASH_READ_D        ENABLE_HUSH_BASH_COMPAT
 
-
 /* Build knobs */
 #define LEAK_HUNTING 0
 #define BUILD_AS_NOMMU 0
@@ -411,7 +410,6 @@
  */
 #define ENABLE_HUSH_DOLLAR_OPS 1
 
-
 #if BUILD_AS_NOMMU
 # undef BB_MMU
 # undef USE_FOR_NOMMU
@@ -640,7 +638,6 @@ typedef enum redir_type {
         HEREDOC_QUOTED   = 2,
 } redir_type;
 
-
 struct command {
         pid_t pid;                  /* 0 if exited */
         unsigned assignment_cnt;    /* how many argv[i] are assignments? */
@@ -798,7 +795,6 @@ struct function {
 };
 #endif
 
-
 /* set -/+o OPT support. (TODO: make it optional)
  * bash supports the following opts:
  * allexport       off
@@ -1046,7 +1042,6 @@ struct globals {
         G.sa.sa_flags = SA_RESTART; \
 } while (0)
 
-
 /* Function prototypes for builtins */
 static int builtin_cd(char **argv) FAST_FUNC;
 #if ENABLE_HUSH_ECHO
@@ -1248,8 +1243,8 @@ static const struct built_in_command bltins2[] ALIGN_PTR = {
 #endif
 };
 
-
-/* Debug printouts.
+/*
+ * Debug printouts.
  */
 #if HUSH_DEBUG >= 2
 /* prevent disasters with G.debug_indent < 0 */
@@ -1342,8 +1337,8 @@ static void debug_print_strings(const char *prefix, char **vv)
 # define debug_print_strings(prefix, vv) ((void)0)
 #endif
 
-
-/* Leak hunting. Use hush_leaktool.sh for post-processing.
+/*
+ * Leak hunting. Use hush_leaktool.sh for post-processing.
  */
 #if LEAK_HUNTING
 static void *xxmalloc(int lineno, size_t size)
@@ -1375,8 +1370,8 @@ static void xxfree(void *ptr)
 # define free(p)        xxfree(p)
 #endif
 
-
-/* Syntax and runtime errors. They always abort scripts.
+/*
+ * Syntax and runtime errors. They always abort scripts.
  * In interactive use they usually discard unparsed and/or unexecuted commands
  * and return to the prompt.
  * HUSH_DEBUG >= 2 prints line number in this file where it was detected.
@@ -1469,8 +1464,8 @@ static void syntax_error_unexpected_ch(unsigned lineno UNUSED_PARAM, int ch)
 # define syntax_error_unexpected_ch(ch) syntax_error_unexpected_ch(__LINE__, ch)
 #endif
 
-
-/* Utility functions
+/*
+ * Utility functions
  */
 /* Replace each \x with x in place, return ptr past NUL. */
 static char *unbackslash(char *src)
@@ -1616,8 +1611,9 @@ static int xdup_CLOEXEC_and_close(int fd, int avoid_fd)
         return newfd;
 }
 
-
-/* Manipulating HFILEs */
+/*
+ * Manipulating HFILEs
+ */
 static HFILE *hfopen(const char *name)
 {
         HFILE *fp;
@@ -1763,8 +1759,8 @@ static int fd_in_HFILEs(int fd)
         return 0;
 }
 
-
-/* Helpers for setting new $n and restoring them back
+/*
+ * Helpers for setting new $n and restoring them back
  */
 typedef struct save_arg_t {
         char *sv_argv0;
@@ -1804,8 +1800,8 @@ static void restore_G_args(save_arg_t *sv, char **argv)
         IF_HUSH_SET(G.global_args_malloced = sv->sv_g_malloced;)
 }
 
-
-/* Basic theory of signal handling in shell
+/*
+ * Basic theory of signal handling in shell
  * ========================================
  * This does not describe what hush does, rather, it is current understanding
  * what it _should_ do. If it doesn't, it's a bug.
@@ -2246,7 +2242,9 @@ static int check_and_run_traps(void)
         return last_sig;
 }
 
-
+/*
+ * Shell and environment variable support
+ */
 static const char *get_cwd(int force)
 {
         if (force || G.cwd == NULL) {
@@ -2261,10 +2259,6 @@ static const char *get_cwd(int force)
         return G.cwd;
 }
 
-
-/*
- * Shell and environment variable support
- */
 static struct variable **get_ptr_to_local_var(const char *name)
 {
         struct variable **pp;
@@ -2538,7 +2532,6 @@ static int unset_local_var(const char *name)
 }
 #endif
 
-
 /*
  * Helpers for "var1=val1 var2=val2 cmd" feature
  */
@@ -2612,7 +2605,6 @@ static void set_vars_and_save_old(char **strings)
         free(strings);
 }
 
-
 /*
  * Unicode helper
  */
@@ -2971,7 +2963,6 @@ static void setup_string_in_str(struct in_str *i, const char *s)
         i->p = s;
 }
 
-
 /*
  * o_string support
  */
@@ -3703,9 +3694,9 @@ static void free_pipe_list(struct pipe *pi)
         }
 }
 
-
-/*** Parsing routines ***/
-
+/*
+ * Parsing routines
+ */
 #ifndef debug_print_tree
 static void debug_print_tree(struct pipe *pi, int lvl)
 {
@@ -4339,7 +4330,6 @@ static int done_word(struct parse_context *ctx)
         return 0;
 }
 
-
 /* Peek ahead in the input to find out if we have a "&n" construct,
  * as in "2>&1", that represents duplicating a file descriptor.
  * Return:
@@ -4635,7 +4625,6 @@ static int fetch_heredocs(o_string *as_string, struct pipe *pi, int heredoc_cnt,
         return heredoc_cnt;
 }
 
-
 static int run_list(struct pipe *pi);
 #if BB_MMU
 #define parse_stream(pstring, heredoc_cnt_ptr, input, end_trigger) \
@@ -6082,9 +6071,9 @@ static struct pipe *parse_stream(char **pstring,
         }
 }
 
-
-/*** Execution routines ***/
-
+/*
+ * Execution routines
+ */
 /* Expansion can recurse, need forward decls: */
 #if !BASH_PATTERN_SUBST && !ENABLE_HUSH_CASE
 #define expand_string_to_string(str, EXP_flags, do_unbackslash) \
@@ -7347,7 +7336,6 @@ static char **expand_assignments(char **argv, int count)
         return p;
 }
 
-
 static void switch_off_special_sigs(unsigned mask)
 {
         unsigned sig = 0;
@@ -7565,7 +7553,6 @@ static void re_execute_shell(char ***to_free, const char *s,
 }
 #endif  /* !BB_MMU */
 
-
 static int run_and_free_list(struct pipe *pi);
 
 /* Executing from string: eval, sh -c '...'
@@ -7796,7 +7783,6 @@ static int process_command_subs(o_string *dest, const char *s)
 }
 #endif /* ENABLE_HUSH_TICK */
 
-
 static void setup_heredoc(struct redir_struct *redir)
 {
         struct fd_pair pair;
@@ -8524,7 +8510,6 @@ static int run_function(const struct function *funcp, char **argv)
 }
 #endif /* ENABLE_HUSH_FUNCTIONS */
 
-
 #if BB_MMU
 #define exec_builtin(to_free, x, argv) \
         exec_builtin(x, argv)
@@ -8558,7 +8543,6 @@ static void exec_builtin(char ***to_free,
 #endif
 }
 
-
 static void execvp_or_die(char **argv) NORETURN;
 static void execvp_or_die(char **argv)
 {
@@ -10184,7 +10168,9 @@ static int run_and_free_list(struct pipe *pi)
         return rcode;
 }
 
-
+/*
+ * Initialization and main
+ */
 static void install_sighandlers(unsigned mask)
 {
         sighandler_t old_handler;
@@ -10861,7 +10847,6 @@ int hush_main(int argc, char **argv)
         hush_exit(G.last_exitcode);
 }
 
-
 /*
  * Built-ins
  */
@@ -12340,7 +12325,6 @@ static int FAST_FUNC builtin_memleak(char **argv UNUSED_PARAM)
         if (l < (unsigned long)p) l = (unsigned long)p;
         free(p);
 
-
 # if 0  /* debug */
         {
                 struct mallinfo mi = mallinfo();
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index e6f0043d0..c3fd0eb57 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -366,7 +366,7 @@ static void set_rtc_param(const char **pp_rtcname, char *rtc_param)
         /* handle param name */
         eq = strchr(rtc_param, '=');
         if (!eq)
-                bb_error_msg_and_die("expected <param>=<value>");
+                bb_simple_error_msg_and_die("expected <param>=<value>");
         *eq = '\0';
         param.param = resolve_rtc_param_alias(rtc_param);
         *eq = '=';