summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Cabessa <ccabessa@genymobile.com>2013-08-05 00:09:16 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2013-08-05 00:09:16 (GMT)
commitadc30b4cf95adc72d1315ab9c2827c46747e4b3e (patch)
treebc8e1e37955db573d7a4ff540d997c76d92f0489
parent985345d0029a55c47068df4f28a3108df301cca8 (diff)
downloadbusybox-adc30b4cf95adc72d1315ab9c2827c46747e4b3e.tar.gz
busybox-adc30b4cf95adc72d1315ab9c2827c46747e4b3e.tar.bz2
syslogd: use _PATH_LOG when available
Signed-off-by: Cédric Cabessa <ccabessa@genymobile.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--sysklogd/syslogd.c11
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;
}