summaryrefslogtreecommitdiff
path: root/busybox/sysklogd
diff options
context:
space:
mode:
authorEric Andersen2005-07-18 23:51:27 +0000
committerEric Andersen2005-07-18 23:51:27 +0000
commit164a716f964bba247c660bc70149234f95146871 (patch)
tree95a8a6f75cb2ed1bb07cb6019088db7348ebf4d4 /busybox/sysklogd
parent8c59a0bf0e9e2d87b0ff273ea3f0bf05bbbf6373 (diff)
downloadbusybox-164a716f964bba247c660bc70149234f95146871.zip
busybox-164a716f964bba247c660bc70149234f95146871.tar.gz
busybox-1.0.1-rc1.patch
http://busybox.net/lists/busybox/2005-July/014974.html
Diffstat (limited to 'busybox/sysklogd')
-rw-r--r--busybox/sysklogd/Makefile5
-rw-r--r--busybox/sysklogd/logger.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/busybox/sysklogd/Makefile b/busybox/sysklogd/Makefile
index 78b0c00..611f46b 100644
--- a/busybox/sysklogd/Makefile
+++ b/busybox/sysklogd/Makefile
@@ -1,6 +1,6 @@
# Makefile for busybox
#
-# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
#
top_srcdir=..
-top_buildddir=..
+top_builddir=..
srcdir=$(top_srcdir)/sysklogd
SYSKLOGD_DIR:=./
include $(top_builddir)/Rules.mak
@@ -29,4 +29,3 @@ all: $(libraries-y)
clean:
rm -f *.o *.a $(AR_TARGET)
-
diff --git a/busybox/sysklogd/logger.c b/busybox/sysklogd/logger.c
index 1615531..fee33b7 100644
--- a/busybox/sysklogd/logger.c
+++ b/busybox/sysklogd/logger.c
@@ -127,7 +127,7 @@ extern int logger_main(int argc, char **argv)
}
}
- openlog(name, option, (pri | LOG_FACMASK));
+ openlog(name, option, 0);
if (optind == argc) {
do {
/* read from stdin */
@@ -152,8 +152,8 @@ extern int logger_main(int argc, char **argv)
message = xrealloc(message, len);
if(!i)
message[0] = 0;
- else
- strcat(message, " ");
+ else
+ strcat(message, " ");
strcat(message, *argv);
argv++;
}