projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lsusb: new applet. +400 bytes
[oweals/busybox.git]
/
sysklogd
/
logread.c
diff --git
a/sysklogd/logread.c
b/sysklogd/logread.c
index 6f4429fd97fb2d2cb90ac98220b68f4fe1cb123d..932bbecbba830200fe2e138d09db97519aa8442b 100644
(file)
--- a/
sysklogd/logread.c
+++ b/
sysklogd/logread.c
@@
-16,6
+16,7
@@
#define DEBUG 0
#define DEBUG 0
+/* our shared key (syslogd.c and logread.c must be in sync) */
enum { KEY_ID = 0x414e4547 }; /* "GENA" */
struct shbuf_ds {
enum { KEY_ID = 0x414e4547 }; /* "GENA" */
struct shbuf_ds {
@@
-38,12
+39,11
@@
struct globals {
#define SMrup (G.SMrup)
#define SMrdn (G.SMrdn)
#define shbuf (G.shbuf)
#define SMrup (G.SMrup)
#define SMrdn (G.SMrdn)
#define shbuf (G.shbuf)
-#define INIT_G() \
- do { \
- memcpy(SMrup, init_sem, sizeof(init_sem)); \
- } while (0)
+#define INIT_G() do { \
+ memcpy(SMrup, init_sem, sizeof(init_sem)); \
+} while (0)
-static void error_exit(const char *str)
ATTRIBUTE_
NORETURN;
+static void error_exit(const char *str) NORETURN;
static void error_exit(const char *str)
{
//release all acquired resources
static void error_exit(const char *str)
{
//release all acquired resources
@@
-60,17
+60,17
@@
static void sem_up(int semid)
error_exit("semop[SMrup]");
}
error_exit("semop[SMrup]");
}
-static void interrupted(int sig
ATTRIBUTE_UNUSED
)
+static void interrupted(int sig
UNUSED_PARAM
)
{
signal(SIGINT, SIG_IGN);
shmdt(shbuf);
{
signal(SIGINT, SIG_IGN);
shmdt(shbuf);
- exit(
0
);
+ exit(
EXIT_SUCCESS
);
}
int logread_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
}
int logread_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int logread_main(int argc
ATTRIBUTE_UNUSED
, char **argv)
+int logread_main(int argc
UNUSED_PARAM
, char **argv)
{
{
-
int
cur;
+
unsigned
cur;
int log_semid; /* ipc semaphore id */
int log_shmid; /* ipc shared memory id */
smallint follow = getopt32(argv, "f");
int log_semid; /* ipc semaphore id */
int log_shmid; /* ipc shared memory id */
smallint follow = getopt32(argv, "f");
@@
-135,7
+135,7
@@
int logread_main(int argc ATTRIBUTE_UNUSED, char **argv)
} else { /* logread -f */
if (cur == shbuf_tail) {
sem_up(log_semid);
} else { /* logread -f */
if (cur == shbuf_tail) {
sem_up(log_semid);
- fflush
(stdout
);
+ fflush
_all(
);
sleep(1); /* TODO: replace me with a sleep_on */
continue;
}
sleep(1); /* TODO: replace me with a sleep_on */
continue;
}