Merge commit 'remotes/fml/master'

[paraslash.git] / exec.c

diff --git a/exec.c b/exec.c
index b8f2df57f8c3c5768bb586aa34a5427decd29eae..0886a0b772f504e6009ae898f03858bb18ad0cf3 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2003-2006 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file exec.c helper functions for spawning new processes */
@@ -34,7 +22,7 @@
  *
  * \sa null(4), pipe(2), dup2(2), fork(2), exec(3)
  */
-static int para_exec(pid_t *pid, const char *file, char *const args[], int *fds)
+static int para_exec(pid_t *pid, const char *file, char *const *const args, int *fds)
 {
        int ret, in[2] = {-1, -1}, out[2] = {-1, -1}, err[2] = {-1, -1},
                null = -1; /* ;) */
@@ -143,11 +131,12 @@ err_out:
 int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds)
 {
        int argc, ret;
-       char **argv, *tmp = para_strdup(cmdline);
+       char **argv;
+       char *tmp = para_strdup(cmdline);
 
        if (!tmp)
                exit(EXIT_FAILURE);
-       argc = split_args(tmp, &argv, ' ');
+       argc = split_args(tmp, &argv, " \t");
        ret = para_exec(pid, argv[0], argv, fds);
        free(argv);
        free(tmp);