aboutsummaryrefslogtreecommitdiff
path: root/sysklogd
diff options
context:
space:
mode:
Diffstat (limited to 'sysklogd')
-rw-r--r--sysklogd/klogd.c6
-rw-r--r--sysklogd/logread.c3
-rw-r--r--sysklogd/syslogd_and_logger.c1
3 files changed, 7 insertions, 3 deletions
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 03d65b37f..845c49a5e 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -58,6 +58,7 @@
58//usage: "\n -n Run in foreground" 58//usage: "\n -n Run in foreground"
59 59
60#include "libbb.h" 60#include "libbb.h"
61#include "common_bufsiz.h"
61#include <syslog.h> 62#include <syslog.h>
62 63
63 64
@@ -145,9 +146,10 @@ static void klogd_close(void)
145 146
146#endif 147#endif
147 148
148#define log_buffer bb_common_bufsiz1 149#define log_buffer bb_common_bufsiz1
150#define sizeof_log_buffer COMMON_BUFSIZE
149enum { 151enum {
150 KLOGD_LOGBUF_SIZE = sizeof(log_buffer), 152 KLOGD_LOGBUF_SIZE = sizeof_log_buffer,
151 OPT_LEVEL = (1 << 0), 153 OPT_LEVEL = (1 << 0),
152 OPT_FOREGROUND = (1 << 1), 154 OPT_FOREGROUND = (1 << 1),
153}; 155};
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index 781a603b2..ebd7f8b2c 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -42,6 +42,7 @@
42//usage: "\n -F Same as -f, but dump buffer first" 42//usage: "\n -F Same as -f, but dump buffer first"
43 43
44#include "libbb.h" 44#include "libbb.h"
45#include "common_bufsiz.h"
45#include <sys/ipc.h> 46#include <sys/ipc.h>
46#include <sys/sem.h> 47#include <sys/sem.h>
47#include <sys/shm.h> 48#include <sys/shm.h>
@@ -67,7 +68,7 @@ struct globals {
67 struct sembuf SMrdn[2]; // {1, 0}, {0, +1, SEM_UNDO} 68 struct sembuf SMrdn[2]; // {1, 0}, {0, +1, SEM_UNDO}
68 struct shbuf_ds *shbuf; 69 struct shbuf_ds *shbuf;
69} FIX_ALIASING; 70} FIX_ALIASING;
70#define G (*(struct globals*)&bb_common_bufsiz1) 71#define G (*(struct globals*)bb_common_bufsiz1)
71#define SMrup (G.SMrup) 72#define SMrup (G.SMrup)
72#define SMrdn (G.SMrdn) 73#define SMrdn (G.SMrdn)
73#define shbuf (G.shbuf) 74#define shbuf (G.shbuf)
diff --git a/sysklogd/syslogd_and_logger.c b/sysklogd/syslogd_and_logger.c
index 0964f239c..6458a9332 100644
--- a/sysklogd/syslogd_and_logger.c
+++ b/sysklogd/syslogd_and_logger.c
@@ -8,6 +8,7 @@
8 */ 8 */
9 9
10#include "libbb.h" 10#include "libbb.h"
11#include "common_bufsiz.h"
11#define SYSLOG_NAMES 12#define SYSLOG_NAMES
12#define SYSLOG_NAMES_CONST 13#define SYSLOG_NAMES_CONST
13#include <syslog.h> 14#include <syslog.h>