mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-12-18 00:58:18 +00:00
Make ffserver daemon chdir()s just after log init. This way a
relative path for the logfile is resolved according to the directory where ffserver has been launched, as the user expects. Originally committed as revision 13911 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
b06759549f
commit
496a613293
@ -4496,7 +4496,6 @@ int main(int argc, char **argv)
|
|||||||
} else {
|
} else {
|
||||||
/* child */
|
/* child */
|
||||||
setsid();
|
setsid();
|
||||||
chdir("/");
|
|
||||||
close(0);
|
close(0);
|
||||||
open("/dev/null", O_RDWR);
|
open("/dev/null", O_RDWR);
|
||||||
if (strcmp(logfilename, "-") != 0) {
|
if (strcmp(logfilename, "-") != 0) {
|
||||||
@ -4520,6 +4519,9 @@ int main(int argc, char **argv)
|
|||||||
av_log_set_callback(http_av_log);
|
av_log_set_callback(http_av_log);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ffserver_daemon)
|
||||||
|
chdir("/");
|
||||||
|
|
||||||
if (http_server() < 0) {
|
if (http_server() < 0) {
|
||||||
http_log("Could not start server\n");
|
http_log("Could not start server\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
|
Loading…
Reference in New Issue
Block a user