github: Update for main branch

[mirror_lxc.git] / src / lxc / error.c

diff --git a/src/lxc/error.c b/src/lxc/error.c
index 2e8f26893d17d5b3283fa88826c7a1ee2b738503..05503ff83f49b0953b82ac2edc0c35cdf3d4e0f2 100644 (file)
--- a/src/lxc/error.c
+++ b/src/lxc/error.c
@@ -1,11 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 
 #include "error.h"
 #include "log.h"
+#include "process_utils.h"
 
 lxc_log_define(error, lxc);
 
@@ -18,7 +21,7 @@ lxc_log_define(error, lxc);
  *   128+n       signal n received by the application
  *   255         lxc error
  */
-extern int  lxc_error_set_and_log(int pid, int status)
+int lxc_error_set_and_log(int pid, int status)
 {
        int ret = 0;
 
@@ -26,12 +29,12 @@ extern int  lxc_error_set_and_log(int pid, int status)
                ret = WEXITSTATUS(status);
                if (ret)
                        INFO("Child <%d> ended on error (%d)", pid, ret);
-       }
-
-       if (WIFSIGNALED(status)) {
-               int signal = WTERMSIG(status);
-               INFO("Child <%d> ended on signal (%d)", pid, signal);
-               ret = 128 + signal;
+       } else if (WIFSIGNALED(status)) {
+               int signal_nr = WTERMSIG(status);
+               INFO("Child <%d> ended on signal %s(%d)", pid, signal_name(signal_nr), signal_nr);
+               ret = 128 + signal_nr;
+       } else {
+               ERROR("Invalid exit status (%d)", status);
        }
 
        return ret;