oysteikt/heimdal
0
0
Fork 0
Code Issues 4 Pull Requests Releases Activity

roken: Don't define any global vars in the pidfile namespace.

Browse Source 
Newer util.h from NetBSD defines pidfile_path() which conflicts
here.
This commit is contained in:
Roy Marples
2026-05-30 11:25:32 +01:00
committed by Nico Williams
parent e1ab030717
commit 1f0f31c954
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/roken/write_pid.c
+9 -9
View File
@@ -91,14 +91,14 @@ pid_file_delete(char **filename)
}
}
static char *pidfile_path;
static pid_t pidfile_pid;
static char *rk_pidfile_path;
static pid_t rk_pidfile_pid;
static void
pidfile_cleanup(void)
{
if (pidfile_path != NULL && pidfile_pid == getpid())
pid_file_delete(&pidfile_path);
if (rk_pidfile_path != NULL && rk_pidfile_pid == getpid())
pid_file_delete(&rk_pidfile_path);
}
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
@@ -113,17 +113,17 @@ rk_pidfile(const char *bname)
pidfile(bname);
#endif
if (pidfile_path != NULL)
if (rk_pidfile_path != NULL)
return;
if (bname == NULL)
bname = getprogname();
pidfile_path = pid_file_write(bname);
pidfile_pid = getpid();
rk_pidfile_path = pid_file_write(bname);
rk_pidfile_pid = getpid();
#if defined(HAVE_ATEXIT)
if (pidfile_path != NULL)
if (rk_pidfile_path != NULL)
atexit(pidfile_cleanup);
#elif defined(HAVE_ON_EXIT)
if (pidfile_path != NULL)
if (rk_pidfile_path != NULL)
on_exit(pidfile_cleanup);
#endif
}