Kyoshiro/bip
1
0
Fork 0
forked from bip/bip
Code Pull Requests Activity

[cleanup] Try to cleanup this pid mess

Browse Source 
close files, but no too soon...
This commit is contained in:
Arnaud Cornet 2009-01-16 15:17:34 +01:00
parent 2d9d388fba
commit 0e2f305d4e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bip.c
View File

@ -196,6 +196,7 @@ int do_pid_stuff(void)
char longpath[1024]; char longpath[1024];
FILE *f; FILE *f;
int fd; int fd;
try_again: try_again:
fd = -1; fd = -1;
f = fopen(conf_pid_file, "r"); f = fopen(conf_pid_file, "r");
@ -223,8 +224,11 @@ pid_is_there:
{ {
pid_t pid; pid_t pid;
long unsigned int p; long unsigned int p;
if (fd != -1)
close(fd);
if (f) { if (f) {
int c = fscanf(f, "%ld", &p); int c = fscanf(f, "%ld", &p);
fclose(f);
pid = p; pid = p;
if (c != 1 || p == 0) { if (c != 1 || p == 0) {
mylog(LOG_INFO, "pid file found but invalid " mylog(LOG_INFO, "pid file found but invalid "
@ -234,9 +238,6 @@ pid_is_there:
"check permissions.\n", "check permissions.\n",
conf_pid_file); conf_pid_file);
} }
fclose(f);
if (fd != -1)
close(fd);
goto try_again; goto try_again;
} }
} else } else
@ -244,7 +245,6 @@ pid_is_there:
int kr = kill(pid, 0); int kr = kill(pid, 0);
if (kr == -1 && (errno == ESRCH || errno == EPERM)) { if (kr == -1 && (errno == ESRCH || errno == EPERM)) {
/* that's not bip! */ /* that's not bip! */
fclose(f);
if (unlink(conf_pid_file)) { if (unlink(conf_pid_file)) {
fatal("Cannot delete pid file '%s', check " fatal("Cannot delete pid file '%s', check "
"permissions.\n", "permissions.\n",
@ -254,7 +254,8 @@ pid_is_there:
} }
if (pid) if (pid)
mylog(LOG_INFO, "pid file found (pid %ld).", pid); mylog(LOG_INFO, "pid file found (pid %ld).", pid);
mylog(LOG_FATAL, "Another instance of bip is certainly runing."); mylog(LOG_FATAL,
"Another instance of bip is certainly runing.");
mylog(LOG_FATAL, "If you are sure this is not the case remove" mylog(LOG_FATAL, "If you are sure this is not the case remove"
" %s.", conf_pid_file); " %s.", conf_pid_file);
exit(2); exit(2);