Fix --config-file for relative paths.

[dss.git] / exec.c

diff --git a/exec.c b/exec.c
index f00b080213c089dbd1b6b8b0b18d771da7c0afd4..ece7ec29aa233051cf10bd5c4f3b1b6adfd14cfe 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2003-2011 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /** \file exec.c Helper functions for spawning new processes. */
 
@@ -15,8 +11,8 @@
 
 #include "gcc-compat.h"
 #include "log.h"
-#include "error.h"
-#include "string.h"
+#include "err.h"
+#include "str.h"
 #include "exec.h"
 
 /**
@@ -33,7 +29,7 @@
 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 */
@@ -42,7 +38,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);
-       DSS_EMERG_LOG("execvp error: %s\n", strerror(errno));
+       DSS_EMERG_LOG(("execvp error: %s\n", strerror(errno)));
        _exit(EXIT_FAILURE);
 }
 
@@ -50,7 +46,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.
- * \param cmdline Holds the command and its arguments, seperated by spaces.
+ * \param cmdline Holds the command and its arguments, separated by spaces.
  *
  * This function uses fork/exec to create a new process.
  *
@@ -60,7 +56,7 @@ void dss_exec_cmdline_pid(pid_t *pid, const char *cmdline)
 {
        char **argv, *tmp = dss_strdup(cmdline);
 
-       split_args(tmp, &argv, " \t");
+       split_args(tmp, &argv);
        dss_exec(pid, argv[0], argv);
        free(argv);
        free(tmp);