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

Close some fds, original path from Trou.

Browse Source
This commit is contained in:
Arnaud Cornet 2009-01-16 15:09:53 +01:00
parent 7565b9cb8e
commit 2d9d388fba
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bip.c
View File

@ -195,7 +195,9 @@ int do_pid_stuff(void)
char hname[1024]; char hname[1024];
char longpath[1024]; char longpath[1024];
FILE *f; FILE *f;
int fd;
try_again: try_again:
fd = -1;
f = fopen(conf_pid_file, "r"); f = fopen(conf_pid_file, "r");
if (f) if (f)
goto pid_is_there; goto pid_is_there;
@ -203,7 +205,6 @@ try_again:
fatal("%s %s", "gethostname", strerror(errno)); fatal("%s %s", "gethostname", strerror(errno));
snprintf(longpath, 1023, "%s.%s.%ld", conf_pid_file, hname, snprintf(longpath, 1023, "%s.%s.%ld", conf_pid_file, hname,
(long unsigned int)getpid()); (long unsigned int)getpid());
int fd;
if ((fd = open(longpath, O_CREAT|O_WRONLY, S_IWUSR|S_IRUSR)) == -1) if ((fd = open(longpath, O_CREAT|O_WRONLY, S_IWUSR|S_IRUSR)) == -1)
fatal("Cannot write to PID file (%s) %s", longpath, fatal("Cannot write to PID file (%s) %s", longpath,
strerror(errno)); strerror(errno));
@ -228,13 +229,14 @@ pid_is_there:
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 "
"data inside. Continuing...\n"); "data inside. Continuing...\n");
fclose(f);
if (unlink(conf_pid_file)) { if (unlink(conf_pid_file)) {
fatal("Cannot delete pid file '%s', " fatal("Cannot delete pid file '%s', "
"check permissions.\n", "check permissions.\n",
conf_pid_file); conf_pid_file);
} }
close(fd); fclose(f);
if (fd != -1)
close(fd);
goto try_again; goto try_again;
} }
} else } else