[git commit] syslogd: use _PATH_LOG when available

Denys Vlasenko vda.linux at googlemail.com
Mon Aug 5 00:09:16 UTC 2013


commit: http://git.busybox.net/busybox/commit/?id=adc30b4cf95adc72d1315ab9c2827c46747e4b3e
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Cédric Cabessa <ccabessa at genymobile.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 sysklogd/syslogd.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 4f45b4f..a6a4ff2 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -58,6 +58,9 @@
 #define SYSLOG_NAMES_CONST
 #include <syslog.h>
 */
+#ifndef _PATH_LOG
+#define _PATH_LOG	"/dev/log"
+#endif
 
 #include <sys/un.h>
 #include <sys/uio.h>
@@ -824,8 +827,8 @@ static NOINLINE int create_socket(void)
 
 	/* Unlink old /dev/log or object it points to. */
 	/* (if it exists, bind will fail) */
-	strcpy(sunx.sun_path, "/dev/log");
-	dev_log_name = xmalloc_follow_symlinks("/dev/log");
+	strcpy(sunx.sun_path, _PATH_LOG);
+	dev_log_name = xmalloc_follow_symlinks(_PATH_LOG);
 	if (dev_log_name) {
 		safe_strncpy(sunx.sun_path, dev_log_name, sizeof(sunx.sun_path));
 		free(dev_log_name);
@@ -834,7 +837,7 @@ static NOINLINE int create_socket(void)
 
 	sock_fd = xsocket(AF_UNIX, SOCK_DGRAM, 0);
 	xbind(sock_fd, (struct sockaddr *) &sunx, sizeof(sunx));
-	chmod("/dev/log", 0666);
+	chmod(_PATH_LOG, 0666);
 
 	return sock_fd;
 }
@@ -905,7 +908,7 @@ static void do_syslogd(void)
 		sz = read(sock_fd, recvbuf, MAX_READ - 1);
 		if (sz < 0) {
 			if (!bb_got_signal)
-				bb_perror_msg("read from /dev/log");
+				bb_perror_msg("read from %s", _PATH_LOG);
 			break;
 		}
 


More information about the busybox-cvs mailing list