aboutsummaryrefslogtreecommitdiff
path: root/sysklogd
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2004-03-15 08:29:22 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2004-03-15 08:29:22 +0000
commitc7bda1ce659294d6e22c06e087f6f265983c7578 (patch)
tree4c6d2217f4d8306c59cf1096f8664e1cfd167213 /sysklogd
parent8854004b41065b3d081af7f3df13a100b0c8bfbe (diff)
downloadbusybox-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.gz
busybox-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.bz2
Remove trailing whitespace. Update copyright to include 2004.
Diffstat (limited to 'sysklogd')
-rw-r--r--sysklogd/Config.in6
-rw-r--r--sysklogd/Makefile2
-rw-r--r--sysklogd/Makefile.in2
-rw-r--r--sysklogd/klogd.c4
-rw-r--r--sysklogd/logger.c14
-rw-r--r--sysklogd/logread.c28
-rw-r--r--sysklogd/syslogd.c2
7 files changed, 29 insertions, 29 deletions
diff --git a/sysklogd/Config.in b/sysklogd/Config.in
index a671f59f1..f77d79e8c 100644
--- a/sysklogd/Config.in
+++ b/sysklogd/Config.in
@@ -79,10 +79,10 @@ config CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
default n
depends on CONFIG_LOGREAD
help
- 'logread' ouput to slow serial terminals can have
+ 'logread' ouput to slow serial terminals can have
side effects on syslog because of the semaphore.
- This option make logread to double buffer copy
- from circular buffer, minimizing semaphore
+ This option make logread to double buffer copy
+ from circular buffer, minimizing semaphore
contention at some minor memory expense.
config CONFIG_KLOGD
diff --git a/sysklogd/Makefile b/sysklogd/Makefile
index 0c01f546f..f6ce14530 100644
--- a/sysklogd/Makefile
+++ b/sysklogd/Makefile
@@ -1,6 +1,6 @@
# Makefile for busybox
#
-# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 1999-2004 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
diff --git a/sysklogd/Makefile.in b/sysklogd/Makefile.in
index d088ae855..1c6e90774 100644
--- a/sysklogd/Makefile.in
+++ b/sysklogd/Makefile.in
@@ -1,6 +1,6 @@
# Makefile for busybox
#
-# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 1999-2004 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
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index df3a668dd..94da61658 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -6,7 +6,7 @@
* Changes: Made this a standalone busybox module which uses standalone
* syslog() client interface.
*
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
*
* Copyright (C) 2000 by Karl M. Hegbloom <karlheg@debian.org>
*
@@ -136,7 +136,7 @@ extern int klogd_main(int argc, char **argv)
bb_show_usage();
}
console_log_level++;
-
+
break;
case 'n':
doFork = FALSE;
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 252cfc494..981cef322 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -2,7 +2,7 @@
/*
* Mini logger implementation for busybox
*
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 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
@@ -49,11 +49,11 @@
# endif
#endif
-/* Decode a symbolic name to a numeric value
+/* Decode a symbolic name to a numeric value
* this function is based on code
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
- *
+ *
* Original copyright notice is retained at the end of this file.
*/
static int decode(char *name, CODE * codetab)
@@ -71,7 +71,7 @@ static int decode(char *name, CODE * codetab)
return (-1);
}
-/* Decode a symbolic name to a numeric value
+/* Decode a symbolic name to a numeric value
* this function is based on code
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -132,7 +132,7 @@ extern int logger_main(int argc, char **argv)
do {
/* read from stdin */
i = 0;
- while ((c = getc(stdin)) != EOF && c != '\n' &&
+ while ((c = getc(stdin)) != EOF && c != '\n' &&
i < (sizeof(buf)-1)) {
buf[i++] = c;
}
@@ -180,8 +180,8 @@ extern int logger_main(int argc, char **argv)
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
- * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
+ * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
+ * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
*
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index 207e78b57..70d1db631 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -62,13 +62,13 @@ static void interrupted(int sig);
*/
static inline void sem_up(int semid)
{
- if ( semop(semid, SMrup, 1) == -1 )
+ if ( semop(semid, SMrup, 1) == -1 )
error_exit("semop[SMrup]");
}
/*
* sem_down - down()'s a semaphore
- */
+ */
static inline void sem_down(int semid)
{
if ( semop(semid, SMrdn, 2) == -1 )
@@ -79,7 +79,7 @@ extern int logread_main(int argc, char **argv)
{
int i;
int follow=0;
-
+
if (argc == 2 && strcmp(argv[1],"-f")==0) {
follow = 1;
} else {
@@ -87,16 +87,16 @@ extern int logread_main(int argc, char **argv)
if (argc > 1)
bb_show_usage();
}
-
+
// handle intrrupt signal
if (setjmp(jmp_env)) goto output_end;
-
+
// attempt to redefine ^C signal
signal(SIGINT, interrupted);
-
+
if ( (log_shmid = shmget(KEY_ID, 0, 0)) == -1)
error_exit("Can't find circular buffer");
-
+
// Attach shared memory to our char*
if ( (buf = shmat(log_shmid, NULL, SHM_RDONLY)) == NULL)
error_exit("Can't get access to circular buffer from syslogd");
@@ -113,7 +113,7 @@ extern int logread_main(int argc, char **argv)
int log_len,j;
#endif
- sem_down(log_semid);
+ sem_down(log_semid);
//printf("head: %i tail: %i size: %i\n",buf->head,buf->tail,buf->size);
if (buf->head == buf->tail || i==buf->tail) {
@@ -125,8 +125,8 @@ extern int logread_main(int argc, char **argv)
printf("<empty syslog>\n");
}
}
-
- // Read Memory
+
+ // Read Memory
#ifdef CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
log_len = buf->tail - i;
if (log_len < 0)
@@ -165,10 +165,10 @@ extern int logread_main(int argc, char **argv)
} while (follow);
output_end:
- if (log_shmid != -1)
+ if (log_shmid != -1)
shmdt(buf);
-
- return EXIT_SUCCESS;
+
+ return EXIT_SUCCESS;
}
static void interrupted(int sig){
@@ -179,7 +179,7 @@ static void interrupted(int sig){
static void error_exit(const char *str){
perror(str);
//release all acquired resources
- if (log_shmid != -1)
+ if (log_shmid != -1)
shmdt(buf);
exit(1);
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index a533bce6b..ac326aa00 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -2,7 +2,7 @@
/*
* Mini syslogd implementation for busybox
*
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
*
* Copyright (C) 2000 by Karl M. Hegbloom <karlheg@debian.org>
*