projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add bitrate, frequency, and channels mood methods.
[paraslash.git]
/
exec.c
diff --git
a/exec.c
b/exec.c
index da7a3568ced41c0b2dc886bcffaa5793f7ca8fd1..b603809d062ee07724f7a4f25b9629ff227f047d 100644
(file)
--- a/
exec.c
+++ b/
exec.c
@@
-1,16
+1,19
@@
/*
/*
- * Copyright (C) 2003-200
8
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-200
9
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file exec.c Helper functions for spawning new processes. */
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file exec.c Helper functions for spawning new processes. */
+
+#include <regex.h>
#include <dirent.h>
#include <dirent.h>
+
#include "para.h"
#include "close_on_fork.h"
#include "error.h"
#include "para.h"
#include "close_on_fork.h"
#include "error.h"
-#include "string.h"
#include "fd.h"
#include "fd.h"
+#include "string.h"
/**
* Spawn a new process and redirect fd 0, 1, and 2.
/**
* Spawn a new process and redirect fd 0, 1, and 2.
@@
-37,7
+40,7
@@
static int para_exec(pid_t *pid, const char *file, char *const *const args, int
if (fds[2] > 0 && pipe(err) < 0)
goto err_out;
if (!fds[0] || !fds[1] || !fds[2]) {
if (fds[2] > 0 && pipe(err) < 0)
goto err_out;
if (!fds[0] || !fds[1] || !fds[2]) {
- ret = para_open("/dev/null", O_RD
ONLY
, 42);
+ ret = para_open("/dev/null", O_RD
WR
, 42);
if (ret < 0)
goto err_out;
null = ret;
if (ret < 0)
goto err_out;
null = ret;
@@
-49,7
+52,6
@@
static int para_exec(pid_t *pid, const char *file, char *const *const args, int
}
*pid = ret;
if (!(*pid)) { /* child */
}
*pid = ret;
if (!(*pid)) { /* child */
- close_listed_fds(); /* close unneeded fds */
if (fds[0] >= 0) {
if (fds[0]) {
close(in[1]);
if (fds[0] >= 0) {
if (fds[0]) {
close(in[1]);
@@
-136,15
+138,13
@@
err_out:
*/
int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds)
{
*/
int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds)
{
- int
argc,
ret;
+ int ret;
char **argv;
char **argv;
- char *tmp = para_strdup(cmdline);
- if (!tmp)
- exit(EXIT_FAILURE);
-
argc = split_args(tmp, &argv, " \t")
;
+ ret = create_argv(cmdline, " \t", &argv);
+ if (ret < 0)
+
return ret
;
ret = para_exec(pid, argv[0], argv, fds);
ret = para_exec(pid, argv[0], argv, fds);
- free(argv);
- free(tmp);
+ free_argv(argv);
return ret;
}
return ret;
}