diff options
| -rw-r--r-- | logread.c | 18 | ||||
| -rw-r--r-- | sysklogd/logread.c | 18 |
2 files changed, 18 insertions, 18 deletions
@@ -58,8 +58,8 @@ static struct shbuf_ds { 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 int shmid = -1; // ipc shared memory id -static int semid = -1; // ipc semaphore id +static int log_shmid = -1; // ipc shared memory id +static int log_semid = -1; // ipc semaphore id static jmp_buf jmp_env; static void error_exit(const char *str); @@ -97,17 +97,17 @@ extern int logread_main(int argc, char **argv) // attempt to redefine ^C signal 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"); // 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"); - 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"); - sem_down(semid); + sem_down(log_semid); // Read Memory i=buf->head; @@ -122,10 +122,10 @@ extern int logread_main(int argc, char **argv) if (i >= buf->size ) i=0; } - sem_up(semid); + sem_up(log_semid); output_end: - if (shmid != -1) + if (log_shmid != -1) shmdt(buf); return EXIT_SUCCESS; @@ -139,7 +139,7 @@ static void interrupted(int sig){ static void error_exit(const char *str){ perror(str); //release all acquired resources - if (shmid != -1) + if (log_shmid != -1) shmdt(buf); exit(1); diff --git a/sysklogd/logread.c b/sysklogd/logread.c index ea881e659..19e8aefa6 100644 --- a/sysklogd/logread.c +++ b/sysklogd/logread.c @@ -58,8 +58,8 @@ static struct shbuf_ds { 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 int shmid = -1; // ipc shared memory id -static int semid = -1; // ipc semaphore id +static int log_shmid = -1; // ipc shared memory id +static int log_semid = -1; // ipc semaphore id static jmp_buf jmp_env; static void error_exit(const char *str); @@ -97,17 +97,17 @@ extern int logread_main(int argc, char **argv) // attempt to redefine ^C signal 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"); // 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"); - 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"); - sem_down(semid); + sem_down(log_semid); // Read Memory i=buf->head; @@ -122,10 +122,10 @@ extern int logread_main(int argc, char **argv) if (i >= buf->size ) i=0; } - sem_up(semid); + sem_up(log_semid); output_end: - if (shmid != -1) + if (log_shmid != -1) shmdt(buf); return EXIT_SUCCESS; @@ -139,7 +139,7 @@ static void interrupted(int sig){ static void error_exit(const char *str){ perror(str); //release all acquired resources - if (shmid != -1) + if (log_shmid != -1) shmdt(buf); exit(1); |