Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-18 07:31:34 +00:00
Code Issues Projects Releases Wiki Activity

Patch from Fillod Stephane

Browse Source 
Add follow mode to logread, ala "tail -f /var/log/messages"
Note: output to a slow serial terminal can have side effects
on syslog because of the semaphore. In such case, define 
RC_LOGREAD.
This commit is contained in:
Glenn L McGrath 2003-09-26 01:03:16 +00:00
parent a79220db6e
commit f7dd10f67c
1 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
sysklogd/logread.c
View File

@ -33,6 +33,7 @@
#include <sys/shm.h> #include <sys/shm.h>
#include <signal.h> #include <signal.h>
#include <setjmp.h> #include <setjmp.h>
#include <unistd.h>
#include "busybox.h" #include "busybox.h"
static const long KEY_ID = 0x414e4547; /*"GENA"*/ static const long KEY_ID = 0x414e4547; /*"GENA"*/
@ -77,10 +78,15 @@ static inline void sem_down(int semid)
extern int logread_main(int argc, char **argv) extern int logread_main(int argc, char **argv)
{ {
int i; int i;
int follow=0;
/* no options, no getopt */ if (argc == 2 && strcmp(argv[1],"-f")==0) {
if (argc > 1) follow = 1;
bb_show_usage(); } else {
/* no options, no getopt */
if (argc > 1)
bb_show_usage();
}
// handle intrrupt signal // handle intrrupt signal
if (setjmp(jmp_env)) goto output_end; if (setjmp(jmp_env)) goto output_end;
@ -98,22 +104,66 @@ extern int logread_main(int argc, char **argv)
if ( (log_semid = semget(KEY_ID, 0, 0)) == -1) if ( (log_semid = semget(KEY_ID, 0, 0)) == -1)
error_exit("Can't get access to semaphone(s) for circular buffer from syslogd"); error_exit("Can't get access to semaphone(s) for circular buffer from syslogd");
sem_down(log_semid); // Suppose atomic memory move
// Read Memory i = follow ? buf->tail : buf->head;
i=buf->head;
//printf("head: %i tail: %i size: %i\n",buf->head,buf->tail,buf->size); do {
if (buf->head == buf->tail) { #undef RC_LOGREAD
printf("<empty syslog>\n"); #ifdef RC_LOGREAD
} char *buf_data;
int log_len,j;
#endif
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) {
if (follow) {
sem_up(log_semid);
sleep(1); /* TODO: replace me with a sleep_on */
continue;
} else {
printf("<empty syslog>\n");
}
}
while ( i != buf->tail) { // Read Memory
printf("%s", buf->data+i); #ifdef RC_LOGREAD
i+= strlen(buf->data+i) + 1; log_len = buf->tail - i;
if (i >= buf->size ) if (log_len < 0)
i=0; log_len += buf->size;
} buf_data = (char *)malloc(log_len);
sem_up(log_semid); if (!buf_data)
error_exit("malloc failed");
if (buf->tail < i) {
memcpy(buf_data, buf->data+i, buf->size-i);
memcpy(buf_data+buf->size-i, buf->data, buf->tail);
} else {
memcpy(buf_data, buf->data+i, buf->tail-i);
}
i = buf->tail;
#else
while ( i != buf->tail) {
printf("%s", buf->data+i);
i+= strlen(buf->data+i) + 1;
if (i >= buf->size )
i=0;
}
#endif
// release the lock on the log chain
sem_up(log_semid);
#ifdef RC_LOGREAD
for (j=0; j < log_len; j+=strlen(buf_data+j)+1) {
printf("%s", buf_data+j);
if (follow)
fflush(stdout);
}
free(buf_data);
#endif
} while (follow);
output_end: output_end:
if (log_shmid != -1) if (log_shmid != -1)