oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

unix/Daemon: move code to ReadPidFile()

Browse Source
This commit is contained in:
Max Kellermann 2015-08-15 16:39:52 +02:00
parent 28a0c46ca7
commit 567bf445bf
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/unix/Daemon.cxx
View File

@ -65,25 +65,15 @@ static int detach_fd = -1;
void void
daemonize_kill(void) daemonize_kill(void)
{ {
FILE *fp;
int pid;
if (pidfile.IsNull()) if (pidfile.IsNull())
FatalError("no pid_file specified in the config file"); FatalError("no pid_file specified in the config file");
fp = FOpen(pidfile, PATH_LITERAL("r")); const pid_t pid = ReadPidFile(pidfile);
if (fp == nullptr) { if (pid < 0) {
const std::string utf8 = pidfile.ToUTF8();
FormatFatalSystemError("Unable to open pid file \"%s\"",
utf8.c_str());
}
if (fscanf(fp, "%i", &pid) != 1) {
const std::string utf8 = pidfile.ToUTF8(); const std::string utf8 = pidfile.ToUTF8();
FormatFatalError("unable to read the pid from file \"%s\"", FormatFatalError("unable to read the pid from file \"%s\"",
utf8.c_str()); utf8.c_str());
} }
fclose(fp);
if (kill(pid, SIGTERM) < 0) if (kill(pid, SIGTERM) < 0)
FormatFatalSystemError("unable to kill process %i", FormatFatalSystemError("unable to kill process %i",

16
src/unix/PidFile.hxx
View File

@ -82,4 +82,20 @@ public:
} }
}; };
gcc_pure
static inline pid_t
ReadPidFile(Path path)
{
FILE *fp = FOpen(path, PATH_LITERAL("r"));
if (fp == nullptr)
return -1;
int pid;
if (fscanf(fp, "%i", &pid) != 1)
pid = -1;
fclose(fp);
return pid;
}
#endif #endif