aboutsummaryrefslogtreecommitdiff
path: root/sysklogd
diff options
context:
space:
mode:
authorGravatar Glenn L McGrath <bug1@ihug.co.nz>2003-09-26 00:49:05 +0000
committerGravatar Glenn L McGrath <bug1@ihug.co.nz>2003-09-26 00:49:05 +0000
commita79220db6e71b7fa509ffa88a02ff1ea785bf811 (patch)
tree511e145ada5a79efd3c891dabcbb4b09dce651ce /sysklogd
parent6b0658f5c09812367c0391e32d745ea2f04af8e4 (diff)
downloadbusybox-a79220db6e71b7fa509ffa88a02ff1ea785bf811.tar.gz
busybox-a79220db6e71b7fa509ffa88a02ff1ea785bf811.tar.bz2
add size parameter to syslogd -C
Patch by Padraig, resubmitted by Fillod Stephane
Diffstat (limited to 'sysklogd')
-rw-r--r--sysklogd/syslogd.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index a7712d445..3ba239882 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -106,8 +106,7 @@ static struct sembuf SMwdn[3] = { {0, 0}, {1, 0}, {1, +1} }; // set SMwdn
static int shmid = -1; // ipc shared memory id
static int s_semid = -1; // ipc semaphore id
-int data_size = 16000; // data size
-int shm_size = 16000 + sizeof(*buf); // our buffer size
+static int data_size = 16000; // default data size
static int circular_logging = FALSE;
/*
@@ -149,7 +148,7 @@ void ipcsyslog_cleanup(void)
void ipcsyslog_init(void)
{
if (buf == NULL) {
- if ((shmid = shmget(KEY_ID, shm_size, IPC_CREAT | 1023)) == -1) {
+ if ((shmid = shmget(KEY_ID, data_size, IPC_CREAT | 1023)) == -1) {
bb_perror_msg_and_die("shmget");
}
@@ -157,7 +156,7 @@ void ipcsyslog_init(void)
bb_perror_msg_and_die("shmat");
}
- buf->size = data_size;
+ buf->size = data_size - sizeof(*buf);
buf->head = buf->tail = 0;
// we'll trust the OS to set initial semval to 0 (let's hope)
@@ -579,7 +578,7 @@ extern int syslogd_main(int argc, char **argv)
char *p;
/* do normal option parsing */
- while ((opt = getopt(argc, argv, "m:nO:R:LC")) > 0) {
+ while ((opt = getopt(argc, argv, "m:nO:R:LC::")) > 0) {
switch (opt) {
case 'm':
MarkInterval = atoi(optarg) * 60;
@@ -605,6 +604,12 @@ extern int syslogd_main(int argc, char **argv)
#endif
#ifdef CONFIG_FEATURE_IPC_SYSLOG
case 'C':
+ if (optarg) {
+ int buf_size = atoi(optarg);
+ if (buf_size >= 4) {
+ data_size = buf_size;
+ }
+ }
circular_logging = TRUE;
break;
#endif