nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-radv-filterd: Ship with own implementation of error()

Browse Source
This commit is contained in:
Jan-Philipp Litza 2017-02-08 17:05:52 +01:00
parent 5a4dc1f983
commit 3bf4d12911
No known key found for this signature in database
GPG Key ID: 1FB658053CE27196
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/gluon-radv-filterd/src/gluon-radv-filterd.c
View File

@ -24,7 +24,6 @@
*/
#define _GNU_SOURCE
#include <error.h>
#include <errno.h>
#include <signal.h>
#include <stdarg.h>
@ -123,6 +122,18 @@ struct global {
};
static void error(int status, int errnum, char *message, ...) {
va_list ap;
va_start(ap, message);
fflush(stdout);
vfprintf(stderr, message, ap);
if (errnum)
fprintf(stderr, ": %s", strerror(errnum));
fprintf(stderr, "\n");
if (status)
exit(status);
}
static void cleanup() {
struct router *router;
close(G.sock);
@ -464,7 +475,7 @@ static int fork_execvp_timeout(struct timespec *timeout, const char *file, const
if (ret == SIGCHLD) {
if (info.si_pid != child) {
cleanup();
error_at_line(1, 0, __FILE__, __LINE__,
error(1, 0,
"BUG: We received a SIGCHLD from a child we didn't spawn (expected PID %d, got %d)",
child, info.si_pid);
}
@ -479,8 +490,8 @@ static int fork_execvp_timeout(struct timespec *timeout, const char *file, const
else if (ret < 0)
warn_errno("sigtimedwait failed, killing child");
else
error_at_line(1, 0, __FILE__, __LINE__,
"BUG: sigtimedwait() return some other signal than SIGCHLD: %d",
error(1, 0,
"BUG: sigtimedwait() returned some other signal than SIGCHLD: %d",
ret);
kill(child, SIGKILL);