diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2014-12-09 03:03:41 -0300 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2014-12-26 17:45:56 -0300 |
| commit | 18011888cc8791ab6c3d1a3563ff62a834f77a92 (patch) | |
| tree | e0274e32dab0891f039a3b005190f4e91e6da525 | |
| parent | ec42251715294719e790e4cc48b29f99e74b2a65 (diff) | |
| download | ffmpeg-18011888cc8791ab6c3d1a3563ff62a834f77a92.tar.gz | |
ffserver: reindent start_children()
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
| -rw-r--r-- | ffserver.c | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/ffserver.c b/ffserver.c index d1e66387df..94d315f994 100644 --- a/ffserver.c +++ b/ffserver.c @@ -407,43 +407,41 @@ static void start_children(FFServerStream *feed) if (!feed->child_argv || feed->pid) continue; - feed->pid_start = time(0); + feed->pid_start = time(0); - feed->pid = fork(); - - if (feed->pid < 0) { - http_log("Unable to create children\n"); - exit(1); - } - - if (feed->pid) - continue; + feed->pid = fork(); + if (feed->pid < 0) { + http_log("Unable to create children\n"); + exit(1); + } - /* In child */ + if (feed->pid) + continue; - http_log("Launch command line: "); - http_log("%s ", pathname); - for (i = 1; feed->child_argv[i] && feed->child_argv[i][0]; i++) - http_log("%s ", feed->child_argv[i]); - http_log("\n"); + /* In child */ - for (i = 3; i < 256; i++) - close(i); + http_log("Launch command line: "); + http_log("%s ", pathname); - if (!config.debug) { - if (!freopen("/dev/null", "r", stdin)) - http_log("failed to redirect STDIN to /dev/null\n;"); - if (!freopen("/dev/null", "w", stdout)) - http_log("failed to redirect STDOUT to /dev/null\n;"); - if (!freopen("/dev/null", "w", stderr)) - http_log("failed to redirect STDERR to /dev/null\n;"); - } + for (i = 1; feed->child_argv[i] && feed->child_argv[i][0]; i++) + http_log("%s ", feed->child_argv[i]); + http_log("\n"); - signal(SIGPIPE, SIG_DFL); + for (i = 3; i < 256; i++) + close(i); - execvp(pathname, feed->child_argv); + if (!config.debug) { + if (!freopen("/dev/null", "r", stdin)) + http_log("failed to redirect STDIN to /dev/null\n;"); + if (!freopen("/dev/null", "w", stdout)) + http_log("failed to redirect STDOUT to /dev/null\n;"); + if (!freopen("/dev/null", "w", stderr)) + http_log("failed to redirect STDERR to /dev/null\n;"); + } - _exit(1); + signal(SIGPIPE, SIG_DFL); + execvp(pathname, feed->child_argv); + _exit(1); } } |