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

roken: Add trailing / to PID file DIR path

Browse Source 
Otherwise if $HEIM_PIDFILE_DIR doesn't end in / then the pidfile gets
created in the parent.
This commit is contained in:
Nicolas Williams
2022-11-29 17:54:19 -06:00
parent b4c0ef9970
commit badbef825d
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/roken/write_pid.c
View File

@@ -43,6 +43,8 @@ ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL
pid_file_write(const char *progname) pid_file_write(const char *progname)
{ {
const char *pidfile_dir = NULL; const char *pidfile_dir = NULL;
const char *sep = "/";
size_t pidfile_dir_len;
char *ret = NULL; char *ret = NULL;
FILE *fp; FILE *fp;
@@ -57,7 +59,17 @@ pid_file_write(const char *progname)
if (pidfile_dir == NULL) if (pidfile_dir == NULL)
pidfile_dir = _PATH_VARRUN; pidfile_dir = _PATH_VARRUN;
if (asprintf(&ret, "%s%s.pid", pidfile_dir, progname) < 0 || ret == NULL) pidfile_dir_len = strlen(pidfile_dir);
if (pidfile_dir_len > 1 &&
pidfile_dir[pidfile_dir_len - 1] == '/')
sep = "";
#ifdef WIN32
if (pidfile_dir_len > 1 &&
pidfile_dir[pidfile_dir_len - 1] == '\\')
sep = "";
#endif
if (asprintf(&ret, "%s%s%s.pid", pidfile_dir, sep, progname) < 0 || ret == NULL)
return NULL; return NULL;
fp = fopen(ret, "w"); fp = fopen(ret, "w");
if (fp == NULL) { if (fp == NULL) {