#include <stdlib.h>
#include <string.h>
#include <getopt.h>
-#include <unistd.h>
#include <signal.h>
#include <stdarg.h>
#include <syslog.h>
char *data;
int len = 0;
- proc = container_of(s, struct netifd_process, log);
+ proc = container_of(s, struct netifd_process, log.stream);
log_prefix = proc->log_prefix;
if (!log_prefix)
log_prefix = "process";
netifd_log_message(L_NOTICE, "%s (%d): %s [...]\n",
log_prefix, proc->uloop.pid, data);
proc->log_overflow = true;
- }
+ } else
+ break;
+
ustream_consume(s, len);
} while (1);
}
goto error;
if (!pid) {
+ int i;
+
if (env) {
while (*env) {
putenv(*env);
if (proc->dir_fd >= 0)
fchdir(proc->dir_fd);
- dup2(pfds[1], 0);
- dup2(pfds[1], 1);
- dup2(pfds[1], 2);
-
close(pfds[0]);
- close(pfds[1]);
+
+ for (i = 0; i <= 2; i++) {
+ if (pfds[1] == i)
+ continue;
+
+ dup2(pfds[1], i);
+ }
+
+ if (pfds[1] > 2)
+ close(pfds[1]);
execvp(argv[0], (char **) argv);
exit(127);