For SNAT, don't store the pre-fragment L2 header before actions are applied.

[sliver-openvswitch.git] / lib / process.c

diff --git a/lib/process.c b/lib/process.c
index 087ca6b..a06f5dc 100644 (file)
--- a/lib/process.c
+++ b/lib/process.c
@@ -107,6 +107,33 @@ process_init(void)
     }
 }
 
+char *
+process_escape_args(char **argv)
+{
+    struct ds ds = DS_EMPTY_INITIALIZER;
+    char **argp;
+    for (argp = argv; *argp; argp++) {
+        const char *arg = *argp;
+        const char *p;
+        if (argp != argv) {
+            ds_put_char(&ds, ' ');
+        }
+        if (arg[strcspn(arg, " \t\r\n\v\\")]) {
+            ds_put_char(&ds, '"');
+            for (p = arg; *p; p++) {
+                if (*p == '\\' || *p == '\"') {
+                    ds_put_char(&ds, '\\');
+                }
+                ds_put_char(&ds, *p);
+            }
+            ds_put_char(&ds, '"');
+        } else {
+            ds_put_cstr(&ds, arg);
+        }
+    }
+    return ds_cstr(&ds);
+}
+
 /* Starts a subprocess with the arguments in the null-terminated argv[] array.
  * argv[0] is used as the name of the process.  Searches the PATH environment
  * variable to find the program to execute.
@@ -131,29 +158,9 @@ process_start(char **argv,
     process_init();
 
     if (VLOG_IS_DBG_ENABLED()) {
-        struct ds ds = DS_EMPTY_INITIALIZER;
-        char **argp;
-        for (argp = argv; *argp; argp++) {
-            const char *arg = *argp;
-            const char *p;
-            if (argp != argv) {
-                ds_put_char(&ds, ' ');
-            }
-            if (arg[strcspn(arg, " \t\r\n\v\\")]) {
-                ds_put_char(&ds, '"');
-                for (p = arg; *p; p++) {
-                    if (*p == '\\' || *p == '\"') {
-                        ds_put_char(&ds, '\\');
-                    }
-                    ds_put_char(&ds, *p);
-                }
-                ds_put_char(&ds, '"');
-            } else {
-                ds_put_cstr(&ds, arg);
-            }
-        }
-        VLOG_DBG("starting subprocess: %s", ds_cstr(&ds));
-        ds_destroy(&ds);
+        char *args = process_escape_args(argv);
+        VLOG_DBG("starting subprocess: %s", args);
+        free(args);
     }
 
     /* execvp() will search PATH too, but the error in that case is more
@@ -306,15 +313,19 @@ process_status_msg(int status)
     struct ds ds = DS_EMPTY_INITIALIZER;
     if (WIFEXITED(status)) {
         ds_put_format(&ds, "exit status %d", WEXITSTATUS(status));
-    } else if (WIFSIGNALED(status)) {
+    } else if (WIFSIGNALED(status) || WIFSTOPPED(status)) {
+        int signr = WIFSIGNALED(status) ? WTERMSIG(status) : WSTOPSIG(status);
         const char *name = NULL;
 #ifdef HAVE_STRSIGNAL
-        name = strsignal(WTERMSIG(status));
+        name = strsignal(signr);
 #endif
-        ds_put_format(&ds, "killed by signal %d", WTERMSIG(status));
+        ds_put_format(&ds, "%s by signal %d",
+                      WIFSIGNALED(status) ? "killed" : "stopped", signr);
         if (name) {
             ds_put_format(&ds, " (%s)", name);
         }
+    } else {
+        ds_put_format(&ds, "terminated abnormally (%x)", status);
     }
     if (WCOREDUMP(status)) {
         ds_put_cstr(&ds, ", core dumped");