diff --git a/src/cgroup.c b/src/cgroup.c index c5715a2f..2cb56e23 100644 --- a/src/cgroup.c +++ b/src/cgroup.c @@ -54,7 +54,7 @@ void cgroup_init(void) } /* Skip first line, header */ - fgets(buf, sizeof(buf), fp); + (void)fgets(buf, sizeof(buf), fp); while (fgets(buf, sizeof(buf), fp)) { char *cgroup; char rc[80]; diff --git a/src/helpers.c b/src/helpers.c index 17b4d793..34868798 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -432,14 +432,14 @@ void set_hostname(char **hostname) return; } - fgets(*hostname, st.st_size, fp); - chomp(*hostname); + if (fgets(*hostname, st.st_size, fp)) + chomp(*hostname); fclose(fp); } done: if (*hostname) - sethostname(*hostname, strlen(*hostname)); + (void)sethostname(*hostname, strlen(*hostname)); } /* diff --git a/src/serv.c b/src/serv.c index 6dcd3509..359cd9ec 100644 --- a/src/serv.c +++ b/src/serv.c @@ -58,7 +58,9 @@ static void do_list(const char *path) glob_t gl; size_t i; - chdir(path); + if (chdir(path)) + return; + if (glob("*.conf", 0, NULL, &gl)) return; @@ -213,7 +215,7 @@ int do_disable(char *arg, int check) if (chdir(FINIT_RCSD)) err(1, "failed cd %s", FINIT_RCSD); - chdir("enabled"); /* System *may* have enabled/ dir. */ + (void)chdir("enabled"); /* System *may* have enabled/ dir. */ if (check && stat(arg, &st)) errx(1, "%s not (an) enabled (service).", arg); diff --git a/src/service.c b/src/service.c index bd7d4724..e56adee7 100644 --- a/src/service.c +++ b/src/service.c @@ -464,17 +464,18 @@ static int service_start(svc_t *svc) /* Set desired user+group */ if (gid >= 0) - setgid(gid); + (void)setgid(gid); if (uid >= 0) { - setuid(uid); + (void)setuid(uid); /* Set default path for regular users */ if (uid > 0) setenv("PATH", _PATH_DEFPATH, 1); if (home) { setenv("HOME", home, 1); - chdir(home); + if (chdir(home)) + (void)chdir("/"); } } diff --git a/src/utmp-api.c b/src/utmp-api.c index 8ae9b680..55f33fce 100644 --- a/src/utmp-api.c +++ b/src/utmp-api.c @@ -97,7 +97,7 @@ static int logrotate(char *file, int num, off_t sz) (void)rename(file, nfile); create(file, st.st_mode, st.st_uid, st.st_gid); } else { - truncate(file, 0); + (void)truncate(file, 0); } }