BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Oops. Code things so it actually works this time around... 

-Erik
1_00_stable_10817
Eric Andersen 2002-08-05 11:56:25 +00:00
parent c59716ff4c
commit 74b007f7cc
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sysklogd/syslogd.c
View File

@ -129,6 +129,8 @@ static inline void sem_down(int semid)
perror_msg_and_die("semop[SMwdn]"); perror_msg_and_die("semop[SMwdn]");
} }
#define MAXLINE 1024 /* maximum line length */
void ipcsyslog_cleanup(void){ void ipcsyslog_cleanup(void){
printf("Exiting Syslogd!\n"); printf("Exiting Syslogd!\n");
@ -398,14 +400,10 @@ static void domark(int sig)
/* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are /* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are
* enabled, we otherwise get a "storage size isn't constant error. */ * enabled, we otherwise get a "storage size isn't constant error. */
#define BUFSIZE 1023 #define BUFSIZE 1023
static int serveConnection (int conn) static int serveConnection (char* tmpbuf, int n_read)
{ {
RESERVE_CONFIG_BUFFER(tmpbuf, BUFSIZE + 1);
int n_read;
char *p = tmpbuf; char *p = tmpbuf;
n_read = read (conn, tmpbuf, BUFSIZE );
while (p < tmpbuf + n_read) { while (p < tmpbuf + n_read) {
int pri = (LOG_USER | LOG_NOTICE); int pri = (LOG_USER | LOG_NOTICE);
@ -415,8 +413,6 @@ static int serveConnection (int conn)
char *q = line; char *q = line;
tmpbuf[ n_read - 1 ] = '\0';
while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) { while (p && (c = *p) && q < &line[ sizeof (line) - 1 ]) {
if ((c == '<') && !gotpri && isdigit(p[1])) { if ((c == '<') && !gotpri && isdigit(p[1])) {
/* Parse the magic priority number. */ /* Parse the magic priority number. */
@ -443,7 +439,6 @@ static int serveConnection (int conn)
/* Now log it */ /* Now log it */
logMessage (pri, line); logMessage (pri, line);
} }
RELEASE_CONFIG_BUFFER (tmpbuf);
return n_read; return n_read;
} }
@ -555,21 +550,19 @@ static void doSyslogd (void)
--n_ready; --n_ready;
if (fd == sock_fd) { if (fd == sock_fd) {
int conn; int i;
RESERVE_CONFIG_BUFFER(tmpbuf, BUFSIZE + 1);
//printf("New Connection request.\n"); memset(tmpbuf, '\0', BUFSIZE+1);
if ((conn = accept (sock_fd, (struct sockaddr *) &sunx, &addrLength)) < 0) { if ( (i = recv(fd, tmpbuf, MAXLINE - 2, 0)) > 0) {
perror_msg_and_die ("accept error"); if ( serveConnection(tmpbuf, i) <= 0 ) {
close (fd);
FD_CLR(fd, &fds);
}
} else {
perror_msg_and_die ("UNIX socket error");
} }
RELEASE_CONFIG_BUFFER (tmpbuf);
FD_SET(conn, &fds);
//printf("conn: %i, set_size: %i\n",conn,FD_SETSIZE);
} else {
//printf("Serving connection: %i\n",fd);
if ( serveConnection(fd) <= 0 ) {
close (fd);
FD_CLR(fd, &fds);
}
} /* fd == sock_fd */ } /* fd == sock_fd */
}/* FD_ISSET() */ }/* FD_ISSET() */
}/* for */ }/* for */