fixing more compiler warnings

This commit is contained in:
Christian Kruse
2014-03-04 17:58:36 +01:00
parent 90ecb2b107
commit 98c7635fb5

View File

@@ -1366,6 +1366,7 @@ do_daemonize()
{ {
char *ptr, path[MAXLEN]; char *ptr, path[MAXLEN];
pid_t pid = fork(); pid_t pid = fork();
int ret;
switch (pid) switch (pid)
{ {
@@ -1414,7 +1415,12 @@ do_daemonize()
*path = '/'; *path = '/';
} }
chdir(path); ret = chdir(path);
if (ret != 0)
{
log_err("Error changing directory to '%s': %s", path,
strerror(errno));
}
break; break;
@@ -1430,6 +1436,7 @@ check_and_create_pid_file(const char *pid_file)
FILE *fd; FILE *fd;
char buff[MAXLEN]; char buff[MAXLEN];
pid_t pid; pid_t pid;
size_t nread;
if (stat(pid_file, &st) != -1) if (stat(pid_file, &st) != -1)
{ {
@@ -1443,7 +1450,14 @@ check_and_create_pid_file(const char *pid_file)
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
fread(buff, MAXLEN - 1, 1, fd); nread = fread(buff, MAXLEN - 1, 1, fd);
if (nread == 0 && ferror(fd))
{
log_err("Error reading PID file '%s', giving up...\n", pid_file);
exit(ERR_BAD_CONFIG);
}
fclose(fd); fclose(fd);
pid = atoi(buff); pid = atoi(buff);