Redirect the output of child processes to pb_log.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
#include "config.h"
#endif
#include "config.h"
#endif
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
int pb_run_cmd(const char *const *cmd_argv)
{
int pb_run_cmd(const char *const *cmd_argv)
{
- int status;
- pid_t pid;
#if defined(DEBUG)
enum {do_debug = 1};
#else
enum {do_debug = 0};
#endif
#if defined(DEBUG)
enum {do_debug = 1};
#else
enum {do_debug = 0};
#endif
+ int status;
+ pid_t pid;
if (do_debug) {
const char *const *p = cmd_argv;
if (do_debug) {
const char *const *p = cmd_argv;
pb_log("%s: %s\n", __func__, cmd_argv[0]);
pid = fork();
pb_log("%s: %s\n", __func__, cmd_argv[0]);
pid = fork();
if (pid == -1) {
pb_log("%s: fork failed: %s\n", __func__, strerror(errno));
return -1;
}
if (pid == 0) {
if (pid == -1) {
pb_log("%s: fork failed: %s\n", __func__, strerror(errno));
return -1;
}
if (pid == 0) {
+ int log = fileno(pb_log_get_stream());
+
+ /* Redirect child output to log. */
+
+ status = dup2(log, STDOUT_FILENO);
+ assert(status != -1);
+
+ status = dup2(log, STDERR_FILENO);
+ assert(status != -1);
+
execvp(cmd_argv[0], (char *const *)cmd_argv);
pb_log("%s: exec failed: %s\n", __func__, strerror(errno));
exit(EXIT_FAILURE);
execvp(cmd_argv[0], (char *const *)cmd_argv);
pb_log("%s: exec failed: %s\n", __func__, strerror(errno));
exit(EXIT_FAILURE);