emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Wshadow logread fix from Jeff Garzik

Browse Source
This commit is contained in:
Eric Andersen 2001-03-23 17:04:47 +00:00
parent c54f9530ee
commit 8ffaf8d139
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
logread.c
View File

@ -58,8 +58,8 @@ static struct shbuf_ds {
static struct sembuf SMrup[1] = {{0, -1, IPC_NOWAIT | SEM_UNDO}}; // set SMrup static struct sembuf SMrup[1] = {{0, -1, IPC_NOWAIT | SEM_UNDO}}; // set SMrup
static struct sembuf SMrdn[2] = {{1, 0}, {0, +1, SEM_UNDO}}; // set SMrdn static struct sembuf SMrdn[2] = {{1, 0}, {0, +1, SEM_UNDO}}; // set SMrdn
static int shmid = -1; // ipc shared memory id static int log_shmid = -1; // ipc shared memory id
static int semid = -1; // ipc semaphore id static int log_semid = -1; // ipc semaphore id
static jmp_buf jmp_env; static jmp_buf jmp_env;
static void error_exit(const char *str); static void error_exit(const char *str);
@ -97,17 +97,17 @@ extern int logread_main(int argc, char **argv)
// attempt to redefine ^C signal // attempt to redefine ^C signal
signal(SIGINT, interrupted); signal(SIGINT, interrupted);
if ( (shmid = shmget(KEY_ID, 0, 0)) == -1) if ( (log_shmid = shmget(KEY_ID, 0, 0)) == -1)
error_exit("Can't find circular buffer"); error_exit("Can't find circular buffer");
// Attach shared memory to our char* // Attach shared memory to our char*
if ( (buf = shmat(shmid, NULL, SHM_RDONLY)) == NULL) if ( (buf = shmat(log_shmid, NULL, SHM_RDONLY)) == NULL)
error_exit("Can't get access to circular buffer from syslogd"); error_exit("Can't get access to circular buffer from syslogd");
if ( (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(semid); sem_down(log_semid);
// Read Memory // Read Memory
i=buf->head; i=buf->head;
@ -122,10 +122,10 @@ extern int logread_main(int argc, char **argv)
if (i >= buf->size ) if (i >= buf->size )
i=0; i=0;
} }
sem_up(semid); sem_up(log_semid);
output_end: output_end:
if (shmid != -1) if (log_shmid != -1)
shmdt(buf); shmdt(buf);
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -139,7 +139,7 @@ static void interrupted(int sig){
static void error_exit(const char *str){ static void error_exit(const char *str){
perror(str); perror(str);
//release all acquired resources //release all acquired resources
if (shmid != -1) if (log_shmid != -1)
shmdt(buf); shmdt(buf);
exit(1); exit(1);

18
sysklogd/logread.c
View File

@ -58,8 +58,8 @@ static struct shbuf_ds {
static struct sembuf SMrup[1] = {{0, -1, IPC_NOWAIT | SEM_UNDO}}; // set SMrup static struct sembuf SMrup[1] = {{0, -1, IPC_NOWAIT | SEM_UNDO}}; // set SMrup
static struct sembuf SMrdn[2] = {{1, 0}, {0, +1, SEM_UNDO}}; // set SMrdn static struct sembuf SMrdn[2] = {{1, 0}, {0, +1, SEM_UNDO}}; // set SMrdn
static int shmid = -1; // ipc shared memory id static int log_shmid = -1; // ipc shared memory id
static int semid = -1; // ipc semaphore id static int log_semid = -1; // ipc semaphore id
static jmp_buf jmp_env; static jmp_buf jmp_env;
static void error_exit(const char *str); static void error_exit(const char *str);
@ -97,17 +97,17 @@ extern int logread_main(int argc, char **argv)
// attempt to redefine ^C signal // attempt to redefine ^C signal
signal(SIGINT, interrupted); signal(SIGINT, interrupted);
if ( (shmid = shmget(KEY_ID, 0, 0)) == -1) if ( (log_shmid = shmget(KEY_ID, 0, 0)) == -1)
error_exit("Can't find circular buffer"); error_exit("Can't find circular buffer");
// Attach shared memory to our char* // Attach shared memory to our char*
if ( (buf = shmat(shmid, NULL, SHM_RDONLY)) == NULL) if ( (buf = shmat(log_shmid, NULL, SHM_RDONLY)) == NULL)
error_exit("Can't get access to circular buffer from syslogd"); error_exit("Can't get access to circular buffer from syslogd");
if ( (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(semid); sem_down(log_semid);
// Read Memory // Read Memory
i=buf->head; i=buf->head;
@ -122,10 +122,10 @@ extern int logread_main(int argc, char **argv)
if (i >= buf->size ) if (i >= buf->size )
i=0; i=0;
} }
sem_up(semid); sem_up(log_semid);
output_end: output_end:
if (shmid != -1) if (log_shmid != -1)
shmdt(buf); shmdt(buf);
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -139,7 +139,7 @@ static void interrupted(int sig){
static void error_exit(const char *str){ static void error_exit(const char *str){
perror(str); perror(str);
//release all acquired resources //release all acquired resources
if (shmid != -1) if (log_shmid != -1)
shmdt(buf); shmdt(buf);
exit(1); exit(1);