projects
/
dss.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run: Wait for children to die.
[dss.git]
/
exec.c
diff --git
a/exec.c
b/exec.c
index adfd24d42ac724593707376ce8b3dc9d585d08e5..920ea0e2e9086bee1b5d82e72a8f051ad32efd3a 100644
(file)
--- a/
exec.c
+++ b/
exec.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2003-2011 Andre Noll <maan@
systemlinux.org
>
+ * Copyright (C) 2003-2011 Andre Noll <maan@
tuebingen.mpg.de
>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-15,8
+15,9
@@
#include "gcc-compat.h"
#include "log.h"
#include "gcc-compat.h"
#include "log.h"
-#include "error.h"
-#include "string.h"
+#include "err.h"
+#include "str.h"
+#include "exec.h"
/**
* Spawn a new process using execvp().
/**
* Spawn a new process using execvp().
@@
-32,7
+33,7
@@
void dss_exec(pid_t *pid, const char *file, char *const *const args)
{
if ((*pid = fork()) < 0) {
void dss_exec(pid_t *pid, const char *file, char *const *const args)
{
if ((*pid = fork()) < 0) {
- DSS_EMERG_LOG(
"fork error: %s\n", strerror(errno
));
+ DSS_EMERG_LOG(
("fork error: %s\n", strerror(errno)
));
exit(EXIT_FAILURE);
}
if (*pid) /* parent */
exit(EXIT_FAILURE);
}
if (*pid) /* parent */
@@
-41,7
+42,7
@@
void dss_exec(pid_t *pid, const char *file, char *const *const args)
signal(SIGTERM, SIG_DFL);
signal(SIGCHLD, SIG_DFL);
execvp(file, args);
signal(SIGTERM, SIG_DFL);
signal(SIGCHLD, SIG_DFL);
execvp(file, args);
- DSS_EMERG_LOG(
"execvp error: %s\n", strerror(errno
));
+ DSS_EMERG_LOG(
("execvp error: %s\n", strerror(errno)
));
_exit(EXIT_FAILURE);
}
_exit(EXIT_FAILURE);
}
@@
-49,7
+50,7
@@
void dss_exec(pid_t *pid, const char *file, char *const *const args)
* Exec the command given as a command line.
*
* \param pid Will hold the pid of the created process upon return.
* Exec the command given as a command line.
*
* \param pid Will hold the pid of the created process upon return.
- * \param cmdline Holds the command and its arguments, sep
e
rated by spaces.
+ * \param cmdline Holds the command and its arguments, sep
a
rated by spaces.
*
* This function uses fork/exec to create a new process.
*
*
* This function uses fork/exec to create a new process.
*