Module Name: src
Committed By: bad
Date: Mon Dec 16 23:27:34 UTC 2013
Modified Files:
src/usr.bin/rump_allserver: rump_allserver.c
Log Message:
Don't hold back, tell us how you really feel when dlopen() fails.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/rump_allserver/rump_allserver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/rump_allserver/rump_allserver.c
diff -u src/usr.bin/rump_allserver/rump_allserver.c:1.28 src/usr.bin/rump_allserver/rump_allserver.c:1.29
--- src/usr.bin/rump_allserver/rump_allserver.c:1.28 Wed Nov 13 17:47:27 2013
+++ src/usr.bin/rump_allserver/rump_allserver.c Mon Dec 16 23:27:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_allserver.c,v 1.28 2013/11/13 17:47:27 pooka Exp $ */
+/* $NetBSD: rump_allserver.c,v 1.29 2013/12/16 23:27:33 bad Exp $ */
/*-
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include <rump/rumpuser_port.h>
#ifndef lint
-__RCSID("$NetBSD: rump_allserver.c,v 1.28 2013/11/13 17:47:27 pooka Exp $");
+__RCSID("$NetBSD: rump_allserver.c,v 1.29 2013/12/16 23:27:33 bad Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -65,7 +65,11 @@ __dead static void
die(int sflag, int error, const char *reason)
{
- fprintf(stderr, "%s: %s", reason, strerror(error));
+ if (reason != NULL)
+ fputs(reason, stderr);
+ if (error > 0)
+ fprintf(stderr, ": %s", strerror(error));
+ fputc('\n', stderr);
if (!sflag)
rump_daemonize_done(error);
exit(1);
@@ -295,7 +299,8 @@ main(int argc, char *argv[])
snprintf(pb, sizeof(pb), "lib%s.so", optarg);
if (dlopen(pb, RTLD_LAZY|RTLD_GLOBAL) == NULL) {
- die(1, 0, "dlopen lib");
+ fprintf(stderr, "dlopen: %s", dlerror());
+ die(1, 0, NULL);
}
}
break;
