5 files changed, 43 insertions, 12 deletions

diff --git a/miscutils/crond.c b/miscutils/crond.c
index b3762d327..6a384fdfb 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -177,7 +177,7 @@ static void crondlog(unsigned level, const char *msg, va_list va)
 {
         if (level >= G.log_level) {
                 /*
-                 * We are called only for info meesages.
+                 * We are called only for info messages.
                  * Warnings/errors use plain bb_[p]error_msg's, which
                  * need not touch syslog_level
                  * (they are ok with LOG_ERR default).
@@ -989,7 +989,7 @@ static int check_completions(void)
                         if (line->cl_pid <= 0)
                                 continue;
 
-                        r = waitpid(line->cl_pid, NULL, WNOHANG);
+                        r = safe_waitpid(line->cl_pid, NULL, WNOHANG);
                         if (r < 0 || r == line->cl_pid) {
                                 process_finished_job(file->cf_username, line);
                                 if (line->cl_pid == 0) {
@@ -1001,6 +1001,14 @@ static int check_completions(void)
                         /* else: r == 0: "process is still running" */
                         file->cf_has_running = 1;
                 }
+
+                /* Reap any other children we don't actively track.
+                 * Reportedly, some people run crond as init process!
+                 * Thus, we need to reap orphans, like init does.
+                 */
+                while (wait_any_nohang(NULL) > 0)
+                        continue;
+
 //FIXME: if !file->cf_has_running && file->deleted: delete it!
 //otherwise deleted entries will stay forever, right?
                 num_still_running += file->cf_has_running;
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 2934d8eb7..912a501a3 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -382,7 +382,7 @@ static void fb_drawimage(void)
         if (LONE_DASH(G.image_filename)) {
                 theme_file = stdin;
         } else {
-                int fd = open_zipped(G.image_filename, /*fail_if_not_compressed:*/ 0);
+                int fd = open_zipped(G.image_filename, /*die_if_not_compressed:*/ 0);
                 if (fd < 0)
                         bb_simple_perror_msg_and_die(G.image_filename);
                 theme_file = xfdopen_for_read(fd);
diff --git a/miscutils/less.c b/miscutils/less.c
index 467c76e2a..5a8fc5a74 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -1178,7 +1178,7 @@ static int64_t getch_nowait(void)
 
         /* We have kbd_fd in O_NONBLOCK mode, read inside safe_read_key()
          * would not block even if there is no input available */
-        key64 = safe_read_key(kbd_fd, kbd_input, /*timeout off:*/ -2);
+        key64 = safe_read_key(kbd_fd, kbd_input, /*do not poll:*/ -2);
         if ((int)key64 == -1) {
                 if (errno == EAGAIN) {
                         /* No keyboard input available. Since poll() did return,
diff --git a/miscutils/make.c b/miscutils/make.c
index a165274aa..8026917b3 100644
--- a/miscutils/make.c
+++ b/miscutils/make.c
@@ -276,6 +276,7 @@ struct globals {
         time_t ar_mtime;
         int lineno;     // Physical line number in file
         int dispno;     // Line number for display purposes
+        struct cmd *curr_cmd;
         const char *rulepos;
         int rule_idx;
 #define IF_MAX 10
@@ -307,6 +308,7 @@ struct globals {
 #define ar_mtime        (G.ar_mtime)
 #define lineno          (G.lineno)
 #define dispno          (G.dispno)
+#define curr_cmd        (G.curr_cmd)
 #define rulepos         (G.rulepos)
 #define rule_idx        (G.rule_idx)
 #define clevel          (G.clevel)
@@ -338,9 +340,20 @@ static struct name *dyndep(struct name *np, struct rule *infrule,
 static void
 vwarning(FILE *stream, const char *msg, va_list list)
 {
+        const char *m = NULL;
+        int d = 0;
+
+        if (curr_cmd) {
+                m = curr_cmd->c_makefile;
+                d = curr_cmd->c_dispno;
+        } else if (makefile) {
+                m = makefile;
+                d = dispno;
+        }
+
         fprintf(stream, "%s: ", applet_name);
-        if (makefile)
-                fprintf(stream, "(%s:%d): ", makefile, dispno);
+        if (m)
+                fprintf(stream, "(%s:%d): ", m, d);
         vfprintf(stream, msg, list);
         fputc('\n', stream);
 }
@@ -726,6 +739,7 @@ addrule(struct name *np, struct depend *dp, struct cmd *cp, int flag)
 {
         struct rule *rp;
         struct rule **rpp;
+        struct cmd *old_cp;
 
         // Can't mix single-colon and double-colon rules
         if (!posix && (np->n_flag & N_TARGET)) {
@@ -742,7 +756,7 @@ addrule(struct name *np, struct depend *dp, struct cmd *cp, int flag)
                 return;
         }
 
-        if (cp && !(np->n_flag & N_DOUBLE) && getcmd(np)) {
+        if (cp && !(np->n_flag & N_DOUBLE) && (old_cp = getcmd(np))) {
                 // Handle the inference rule redefinition case
                 // .DEFAULT rule can also be redefined (as an extension).
                 if ((np->n_flag & N_INFERENCE)
@@ -751,7 +765,17 @@ addrule(struct name *np, struct depend *dp, struct cmd *cp, int flag)
                         freerules(np->n_rule);
                         np->n_rule = NULL;
                 } else {
-                        error("commands defined twice for target %s", np->n_name);
+                        // We're adding commands to a single colon rule which
+                        // already has some.  Clear the old ones first.
+                        warning("overriding rule for target %s", np->n_name);
+                        curr_cmd = old_cp;
+                        warning("previous rule for target %s", np->n_name);
+                        curr_cmd = NULL;
+
+                        for (rp = np->n_rule; rp; rp = rp->r_next) {
+                                freecmds(rp->r_cmd);
+                                rp->r_cmd = NULL;
+                        }
                 }
         }
 
@@ -2602,8 +2626,7 @@ docmds(struct name *np, struct cmd *cp)
                 uint32_t ssilent, signore, sdomake;
 
                 // Location of command in makefile (for use in error messages)
-                makefile = cp->c_makefile;
-                dispno = cp->c_dispno;
+                curr_cmd = cp;
                 opts &= ~OPT_make;      // We want to know if $(MAKE) is expanded
                 q = command = expand_macros(cp->c_cmd, FALSE);
                 ssilent = silent || (np->n_flag & N_SILENT) || dotouch;
@@ -2697,7 +2720,7 @@ docmds(struct name *np, struct cmd *cp)
                 estat = MAKE_DIDSOMETHING;
         }
 
-        makefile = NULL;
+        curr_cmd = NULL;
         return estat;
 }
 
diff --git a/miscutils/man.c b/miscutils/man.c
index 3954455b4..38c1b9aa3 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -143,7 +143,7 @@ static int run_pipe(char *man_filename, int man, int level)
 
  ordinary_manpage:
         close(STDIN_FILENO);
-        open_zipped(man_filename, /*fail_if_not_compressed:*/ 0); /* guaranteed to use fd 0 (STDIN_FILENO) */
+        open_zipped(man_filename, /*die_if_not_compressed:*/ 0); /* guaranteed to use fd 0 (STDIN_FILENO) */
         if (man) {
                 int w = get_terminal_width(-1);
                 if (w > 10)