storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-justin' of git://github.com/BenoitKnecht/minidlna

Browse Source
This commit is contained in:
Justin Maggard
2013-11-01 17:57:00 -07:00
parent 0cc4fd980d 3995cbdac4
commit 622b0b7411
18 changed files with 447 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
minidlna.c
View File

@ -86,7 +86,7 @@
#include "utils.h"
#include "minissdp.h"
#include "minidlnatypes.h"
#include "daemonize.h"
#include "process.h"
#include "upnpevents.h"
#include "scanner.h"
#include "inotify.h"
@ -155,14 +155,6 @@ sigterm(int sig)
quitting = 1;
}
static void
sigchld(int sig)
{
if (!scanning)
signal(SIGCHLD, SIG_IGN);
waitpid(-1, NULL, WNOHANG);
}
static void
sighup(int sig)
{
@ -369,9 +361,9 @@ rescan:
#if USE_FORK
scanning = 1;
sqlite3_close(db);
*scanner_pid = fork();
*scanner_pid = process_fork();
open_db(&db);
if (!(*scanner_pid)) /* child (scanner) process */
if (*scanner_pid == 0) /* child (scanner) process */
{
start_scanner();
sqlite3_close(db);
@ -379,6 +371,10 @@ rescan:
freeoptions();
exit(EXIT_SUCCESS);
}
else if (*scanner_pid < 0)
{
start_scanner();
}
#else
start_scanner();
#endif
@ -884,7 +880,7 @@ init(int argc, char **argv)
}
else
{
pid = daemonize();
pid = process_daemonize();
#ifdef READYNAS
unlink("/ramfs/.upnp-av_scan");
path = "/var/log/upnp-av.log";
@ -897,7 +893,7 @@ init(int argc, char **argv)
}
log_init(path, log_level);
if (checkforrunning(pidfilename) < 0)
if (process_check_if_running(pidfilename) < 0)
{
DPRINTF(E_ERROR, L_GENERAL, "MiniDLNA is already running. EXITING.\n");
return 1;
@ -923,6 +919,9 @@ init(int argc, char **argv)
DPRINTF(E_FATAL, L_GENERAL, "Failed to set %s handler. EXITING.\n", "SIGPIPE");
if (signal(SIGHUP, &sighup) == SIG_ERR)
DPRINTF(E_FATAL, L_GENERAL, "Failed to set %s handler. EXITING.\n", "SIGHUP");
sa.sa_handler = process_handle_child_termination;
if (sigaction(SIGCHLD, &sa, NULL))
DPRINTF(E_FATAL, L_GENERAL, "Failed to set %s handler. EXITING.\n", "SIGCHLD");
if (writepidfile(pidfilename, pid, uid) != 0)
pidfilename = NULL;
@ -989,7 +988,6 @@ main(int argc, char **argv)
ret = -1;
}
check_db(db, ret, &scanner_pid);
signal(SIGCHLD, &sigchld);
#ifdef HAVE_INOTIFY
if( GETFLAG(INOTIFY_MASK) )
{