emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not silence errors

Browse Source
This commit is contained in:
Christian Ruppert 2012-08-19 00:26:38 +02:00
parent 8dc06e3259
commit 9afdf50667
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/rc/start-stop-daemon.c
View File

@ -305,7 +305,7 @@ parse_schedule(const char *string, int timeout)
} }
static pid_t static pid_t
get_pid(const char *pidfile, bool quiet) get_pid(const char *pidfile)
{ {
FILE *fp; FILE *fp;
pid_t pid; pid_t pid;
@ -314,15 +314,12 @@ get_pid(const char *pidfile, bool quiet)
return -1; return -1;
if ((fp = fopen(pidfile, "r")) == NULL) { if ((fp = fopen(pidfile, "r")) == NULL) {
if (!quiet) eerror("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
eerror("%s: fopen `%s': %s",
applet, pidfile, strerror(errno));
return -1; return -1;
} }
if (fscanf(fp, "%d", &pid) != 1) { if (fscanf(fp, "%d", &pid) != 1) {
if (!quiet) eerror("%s: no pid found in `%s'", applet, pidfile);
eerror("%s: no pid found in `%s'", applet, pidfile);
fclose(fp); fclose(fp);
return -1; return -1;
} }
@ -355,8 +352,7 @@ do_stop(const char *exec, const char *const *argv,
LIST_FOREACH_SAFE(pi, pids, entries, np) { LIST_FOREACH_SAFE(pi, pids, entries, np) {
if (test) { if (test) {
if (!quiet) if (!quiet)
einfo("Would send signal %d to PID %d", einfo("Would send signal %d to PID %d", sig, pi->pid);
sig, pi->pid);
nkilled++; nkilled++;
} else { } else {
if (verbose) if (verbose)
@ -417,7 +413,7 @@ run_stop_schedule(const char *exec, const char *const *argv,
} }
if (pidfile) { if (pidfile) {
pid = get_pid(pidfile, quiet); pid = get_pid(pidfile);
if (pid == -1) if (pid == -1)
return 0; return 0;
} }
@ -436,9 +432,7 @@ run_stop_schedule(const char *exec, const char *const *argv,
if (tkilled == 0) { if (tkilled == 0) {
if (progressed) if (progressed)
printf("\n"); printf("\n");
if (! quiet) eerror("%s: no matching processes found", applet);
eerror("%s: no matching "
"processes found", applet);
} }
return tkilled; return tkilled;
} }
@ -508,14 +502,10 @@ run_stop_schedule(const char *exec, const char *const *argv,
if (progressed) if (progressed)
printf("\n"); printf("\n");
if (! quiet) { if (nrunning == 1)
if (nrunning == 1) eerror("%s: %d process refused to stop", applet, nrunning);
eerror("%s: %d process refused to stop", else
applet, nrunning); eerror("%s: %d process(es) refused to stop", applet, nrunning);
else
eerror("%s: %d process(es) refused to stop",
applet, nrunning);
}
return -nrunning; return -nrunning;
} }
@ -1089,7 +1079,7 @@ start_stop_daemon(int argc, char **argv)
} }
if (pidfile) if (pidfile)
pid = get_pid(pidfile, true); pid = get_pid(pidfile);
else else
pid = 0; pid = 0;
@ -1295,7 +1285,7 @@ start_stop_daemon(int argc, char **argv)
/* We don't redirect stdin as some daemons may need it */ /* We don't redirect stdin as some daemons may need it */
if (background || quiet || redirect_stdout) if (background || quiet || redirect_stdout)
dup2(stdout_fd, STDOUT_FILENO); dup2(stdout_fd, STDOUT_FILENO);
if (background || quiet || redirect_stderr) if (background || redirect_stderr)
dup2(stderr_fd, STDERR_FILENO); dup2(stderr_fd, STDERR_FILENO);
for (i = getdtablesize() - 1; i >= 3; --i) for (i = getdtablesize() - 1; i >= 3; --i)
@ -1326,12 +1316,9 @@ start_stop_daemon(int argc, char **argv)
return -1; return -1;
} }
} while (!WIFEXITED(i) && !WIFSIGNALED(i)); } while (!WIFEXITED(i) && !WIFSIGNALED(i));
if (!WIFEXITED(i) || WEXITSTATUS(i) != 0) { if (!WIFEXITED(i) || WEXITSTATUS(i) != 0)
if (!quiet) eerrorx("%s: failed to start `%s'", applet, exec);
eerrorx("%s: failed to start `%s'",
applet, exec);
exit(EXIT_FAILURE);
}
pid = spid; pid = spid;
} }
@ -1365,7 +1352,7 @@ start_stop_daemon(int argc, char **argv)
alive = true; alive = true;
} else { } else {
if (pidfile) { if (pidfile) {
pid = get_pid(pidfile, true); pid = get_pid(pidfile);
if (pid == -1) { if (pid == -1) {
eerrorx("%s: did not " eerrorx("%s: did not "
"create a valid" "create a valid"