Merge branch 'busybox' into merge

1 files changed, 4 insertions, 3 deletions

diff --git a/findutils/xargs.c b/findutils/xargs.c
index 4399783ea..2ce5634ca 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -277,14 +277,15 @@ static int xargs_exec(void)
                 status = (errno == ENOENT) ? 127 : 126;
         }
         else if (status >= 0x180) {
-                bb_error_msg("'%s' terminated by signal %d",
+                bb_error_msg("'%s' terminated by signal %u",
                         G.args[0], status - 0x180);
                 status = 125;
         }
         else if (status != 0) {
                 if (status == 255) {
                         bb_error_msg("%s: exited with status 255; aborting", G.args[0]);
-                        return 124;
+                        status = 124;
+                        goto ret;
                 }
                 /* "123 if any invocation of the command exited with status 1-125"
                  * This implies that nonzero exit code is remembered,
@@ -293,7 +294,7 @@ static int xargs_exec(void)
                 G.xargs_exitcode = 123;
                 status = 0;
         }
-
+ ret:
         if (status != 0)
                 G.xargs_exitcode = status;
         return status;