diff options
Diffstat (limited to 'src/pulsecore/pid.c')
-rw-r--r-- | src/pulsecore/pid.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/pulsecore/pid.c b/src/pulsecore/pid.c index ce8ef19b..bf9ba983 100644 --- a/src/pulsecore/pid.c +++ b/src/pulsecore/pid.c @@ -171,14 +171,14 @@ static int proc_name_ours(pid_t pid, const char *procname) { good = pa_startswith(stored, expected); pa_xfree(expected); -#if !defined(__OPTIMIZE__) +/*#if !defined(__OPTIMIZE__)*/ if (!good) { /* libtool likes to rename our binary names ... */ expected = pa_sprintf_malloc("%lu (lt-%s)", (unsigned long) pid, procname); good = pa_startswith(stored, expected); pa_xfree(expected); } -#endif +/*#endif*/ return !!good; } @@ -211,6 +211,7 @@ int pa_pid_file_create(const char *procname) { if ((pid = read_pid(fn, fd)) == (pid_t) -1) pa_log_warn("Corrupt PID file, overwriting."); else if (pid > 0) { + int ours = 1; #ifdef OS_IS_WIN32 if ((process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid)) != NULL) { @@ -218,11 +219,13 @@ int pa_pid_file_create(const char *procname) { #else if (kill(pid, 0) >= 0 || errno != ESRCH) { #endif - int ours = 1; if (procname) - if ((ours = proc_name_ours(pid, procname)) < 0) + if ((ours = proc_name_ours(pid, procname)) < 0) { + pa_log_warn("Could not check to see if pid %lu is a pulseaudio process. " + "Asssuming it is and the daemon is already running.", (unsigned long) pid); goto fail; + } if (ours) { pa_log("Daemon already running."); |