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

Latest and greatest. Seems there is a bug.

Browse Source 
-Erik
This commit is contained in:
Erik Andersen 2000-04-14 00:40:31 +00:00
parent 50ed0676ad
commit d5ba77d03e
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sysklogd/syslogd.c
View File

@ -37,7 +37,6 @@
#include <sys/un.h> #include <sys/un.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <limits.h>
#define ksyslog klogctl #define ksyslog klogctl
extern int ksyslog(int type, char *buf, int len); extern int ksyslog(int type, char *buf, int len);
@ -76,7 +75,7 @@ static const char syslogd_usage[] =
/* Note: There is also a function called "message()" in init.c */ /* Note: There is also a function called "message()" in init.c */
/* Print a message to the log file. */ /* Print a message to the log file. */
static void message(char *fmt, ...) static void message(char *fmt, ...)
__attribute__ ((format (printf, 1, 2))); __attribute__ ((format (printf, 1, 2)));
static void message(char *fmt, ...) static void message(char *fmt, ...)
{ {
int fd; int fd;
@ -169,7 +168,6 @@ static void doSyslogd (void)
int sock_fd; int sock_fd;
fd_set readfds; fd_set readfds;
char lfile[PATH_MAX]; char lfile[PATH_MAX];
int t = readlink(_PATH_LOG, lfile, sizeof(lfile) - 1); /* Resolve symlinks */
/* Set up sig handlers */ /* Set up sig handlers */
signal (SIGINT, quit_signal); signal (SIGINT, quit_signal);
@ -179,10 +177,15 @@ static void doSyslogd (void)
signal (SIGALRM, domark); signal (SIGALRM, domark);
alarm (MarkInterval); alarm (MarkInterval);
if (t == -1) /* create the syslog file so realpath() can work
strncpy(lfile, _PATH_LOG, sizeof(lfile)); * (the ugle close(open()) stuff is just a cheap
else * touch command that avoids using system (system
lfile[t] = '\0'; * is always a bad thing to use) */
close(open("touch " _PATH_LOG, O_RDWR | O_CREAT, 0644));
if (realpath(_PATH_LOG, lfile) == NULL) {
perror("Could not resolv path to " _PATH_LOG);
exit (FALSE);
}
unlink (lfile); unlink (lfile);
@ -243,6 +246,7 @@ static void doSyslogd (void)
n_read = read (fd, buf, BUFSIZE); n_read = read (fd, buf, BUFSIZE);
if (n_read < 0) { if (n_read < 0) {
// FIXME .. fd isn't set
perror ("read error"); perror ("read error");
goto close_fd; goto close_fd;
} }

18
syslogd.c
View File

@ -37,7 +37,6 @@
#include <sys/un.h> #include <sys/un.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <limits.h>
#define ksyslog klogctl #define ksyslog klogctl
extern int ksyslog(int type, char *buf, int len); extern int ksyslog(int type, char *buf, int len);
@ -76,7 +75,7 @@ static const char syslogd_usage[] =
/* Note: There is also a function called "message()" in init.c */ /* Note: There is also a function called "message()" in init.c */
/* Print a message to the log file. */ /* Print a message to the log file. */
static void message(char *fmt, ...) static void message(char *fmt, ...)
__attribute__ ((format (printf, 1, 2))); __attribute__ ((format (printf, 1, 2)));
static void message(char *fmt, ...) static void message(char *fmt, ...)
{ {
int fd; int fd;
@ -169,7 +168,6 @@ static void doSyslogd (void)
int sock_fd; int sock_fd;
fd_set readfds; fd_set readfds;
char lfile[PATH_MAX]; char lfile[PATH_MAX];
int t = readlink(_PATH_LOG, lfile, sizeof(lfile) - 1); /* Resolve symlinks */
/* Set up sig handlers */ /* Set up sig handlers */
signal (SIGINT, quit_signal); signal (SIGINT, quit_signal);
@ -179,10 +177,15 @@ static void doSyslogd (void)
signal (SIGALRM, domark); signal (SIGALRM, domark);
alarm (MarkInterval); alarm (MarkInterval);
if (t == -1) /* create the syslog file so realpath() can work
strncpy(lfile, _PATH_LOG, sizeof(lfile)); * (the ugle close(open()) stuff is just a cheap
else * touch command that avoids using system (system
lfile[t] = '\0'; * is always a bad thing to use) */
close(open("touch " _PATH_LOG, O_RDWR | O_CREAT, 0644));
if (realpath(_PATH_LOG, lfile) == NULL) {
perror("Could not resolv path to " _PATH_LOG);
exit (FALSE);
}
unlink (lfile); unlink (lfile);
@ -243,6 +246,7 @@ static void doSyslogd (void)
n_read = read (fd, buf, BUFSIZE); n_read = read (fd, buf, BUFSIZE);
if (n_read < 0) { if (n_read < 0) {
// FIXME .. fd isn't set
perror ("read error"); perror ("read error");
goto close_fd; goto close_fd;
} }