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

* Only remove the pidfile if one was written in the first place. (Thanks Andrea Biardi)

Browse Source
This commit is contained in:
Justin Maggard 2012-02-23 05:55:50 +00:00
parent a156e780a3
commit ef7f537bee
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
minidlna.c
View File

@ -807,7 +807,7 @@ init(int argc, char * * argv)
#endif #endif
} }
if(checkforrunning(pidfilename) < 0) if (checkforrunning(pidfilename) < 0)
{ {
DPRINTF(E_ERROR, L_GENERAL, "MiniDLNA is already running. EXITING.\n"); DPRINTF(E_ERROR, L_GENERAL, "MiniDLNA is already running. EXITING.\n");
return 1; return 1;
@ -816,7 +816,7 @@ init(int argc, char * * argv)
set_startup_time(); set_startup_time();
/* presentation url */ /* presentation url */
if(presurl) if (presurl)
strncpyt(presentationurl, presurl, PRESENTATIONURL_MAX_LEN); strncpyt(presentationurl, presurl, PRESENTATIONURL_MAX_LEN);
else else
strcpy(presentationurl, "/"); strcpy(presentationurl, "/");
@ -825,19 +825,14 @@ init(int argc, char * * argv)
memset(&sa, 0, sizeof(struct sigaction)); memset(&sa, 0, sizeof(struct sigaction));
sa.sa_handler = sigterm; sa.sa_handler = sigterm;
if (sigaction(SIGTERM, &sa, NULL)) if (sigaction(SIGTERM, &sa, NULL))
{ DPRINTF(E_FATAL, L_GENERAL, "Failed to set %s handler. EXITING.\n", SIGTERM);
DPRINTF(E_FATAL, L_GENERAL, "Failed to set SIGTERM handler. EXITING.\n");
}
if (sigaction(SIGINT, &sa, NULL)) if (sigaction(SIGINT, &sa, NULL))
{ DPRINTF(E_FATAL, L_GENERAL, "Failed to set %s handler. EXITING.\n", SIGINT);
DPRINTF(E_FATAL, L_GENERAL, "Failed to set SIGINT handler. EXITING.\n"); if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
} DPRINTF(E_FATAL, L_GENERAL, "Failed to set %s handler. EXITING.\n", SIGPIPE);
if(signal(SIGPIPE, SIG_IGN) == SIG_ERR) { if (writepidfile(pidfilename, pid) != 0)
DPRINTF(E_FATAL, L_GENERAL, "Failed to ignore SIGPIPE signals. EXITING.\n"); pidfilename = NULL;
}
writepidfile(pidfilename, pid);
return 0; return 0;
} }
@ -1232,9 +1227,8 @@ main(int argc, char * * argv)
shutdown: shutdown:
/* kill the scanner */ /* kill the scanner */
if( scanning && scanner_pid ) if( scanning && scanner_pid )
{
kill(scanner_pid, 9); kill(scanner_pid, 9);
}
/* close out open sockets */ /* close out open sockets */
while(upnphttphead.lh_first != NULL) while(upnphttphead.lh_first != NULL)
{ {
@ -1242,17 +1236,18 @@ shutdown:
LIST_REMOVE(e, entries); LIST_REMOVE(e, entries);
Delete_upnphttp(e); Delete_upnphttp(e);
} }
if (sudp >= 0)
if (sudp >= 0) close(sudp); close(sudp);
if (shttpl >= 0) close(shttpl); if (shttpl >= 0)
close(shttpl);
#ifdef TIVO_SUPPORT #ifdef TIVO_SUPPORT
if (sbeacon >= 0) close(sbeacon); if (sbeacon >= 0)
close(sbeacon);
#endif #endif
if(SendSSDPGoodbye(snotify, n_lan_addr) < 0) if(SendSSDPGoodbye(snotify, n_lan_addr) < 0)
{
DPRINTF(E_ERROR, L_GENERAL, "Failed to broadcast good-bye notifications\n"); DPRINTF(E_ERROR, L_GENERAL, "Failed to broadcast good-bye notifications\n");
}
for(i=0; i<n_lan_addr; i++) for(i=0; i<n_lan_addr; i++)
close(snotify[i]); close(snotify[i]);
@ -1281,10 +1276,8 @@ shutdown:
free(last_name); free(last_name);
} }
if(unlink(pidfilename) < 0) if(pidfilename && unlink(pidfilename) < 0)
{
DPRINTF(E_ERROR, L_GENERAL, "Failed to remove pidfile %s: %s\n", pidfilename, strerror(errno)); DPRINTF(E_ERROR, L_GENERAL, "Failed to remove pidfile %s: %s\n", pidfilename, strerror(errno));
}
freeoptions(); freeoptions();