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

Use ssize_t and reduced code where appropriate

Browse Source
This commit is contained in:
Joey Schulze
2007-05-26 18:44:42 +00:00
parent 75b4840911
commit c678f47f8b
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
syslogd.c
View File

@ -828,6 +828,7 @@ int main(argc, argv)
{ {
register int i; register int i;
register char *p; register char *p;
ssize_t msglen;
#if !defined(__GLIBC__) #if !defined(__GLIBC__)
int len, num_fds; int len, num_fds;
#else /* __GLIBC__ */ #else /* __GLIBC__ */
@ -1151,13 +1152,12 @@ int main(argc, argv)
#ifdef SYSLOG_UNIXAF #ifdef SYSLOG_UNIXAF
for (i = 0; i < nfunix; i++) { for (i = 0; i < nfunix; i++) {
if ((fd = funix[i]) != -1 && FD_ISSET(fd, &readfds)) { if ((fd = funix[i]) != -1 && FD_ISSET(fd, &readfds)) {
memset(line, '\0', sizeof(line)); memset(line, 0, sizeof(line));
i = recv(fd, line, MAXLINE - 2, 0); msglen = recv(fd, line, MAXLINE - 2, 0);
dprintf("Message from UNIX socket: #%d\n", fd); dprintf("Message from UNIX socket: #%d\n", fd);
if (i > 0) { if (msglen > 0)
line[i] = line[i+1] = '\0'; printchopped(LocalHostName, line, msglen + 2, fd);
printchopped(LocalHostName, line, i + 2, fd); else if (msglen < 0 && errno != EINTR) {
} else if (i < 0 && errno != EINTR) {
dprintf("UNIX socket error: %d = %s.\n", \ dprintf("UNIX socket error: %d = %s.\n", \
errno, strerror(errno)); errno, strerror(errno));
logerror("recvfrom UNIX"); logerror("recvfrom UNIX");
@ -1169,13 +1169,12 @@ int main(argc, argv)
#ifdef SYSLOG_INET #ifdef SYSLOG_INET
if (InetInuse && AcceptRemote && FD_ISSET(inetm, &readfds)) { if (InetInuse && AcceptRemote && FD_ISSET(inetm, &readfds)) {
len = sizeof(frominet); len = sizeof(frominet);
memset(line, '\0', sizeof(line)); memset(line, 0, sizeof(line));
i = recvfrom(finet, line, MAXLINE - 2, 0, \ msglen = recvfrom(finet, line, MAXLINE - 2, 0, \
(struct sockaddr *) &frominet, &len); (struct sockaddr *) &frominet, &len);
dprintf("Message from inetd socket: #%d, host: %s\n", dprintf("Message from inetd socket: #%d, host: %s\n",
inetm, inet_ntoa(frominet.sin_addr)); inetm, inet_ntoa(frominet.sin_addr));
if (i > 0) { if (msglen > 0) {
line[i] = line[i+1] = '\0';
from = (char *)cvthname(&frominet); from = (char *)cvthname(&frominet);
/* /*
* Here we could check if the host is permitted * Here we could check if the host is permitted
@ -1187,8 +1186,8 @@ int main(argc, argv)
* -Joey * -Joey
*/ */
printchopped(from, line, \ printchopped(from, line, \
i + 2, finet); msglen + 2, finet);
} else if (i < 0 && errno != EINTR && errno != EAGAIN) { } else if (msglen < 0 && errno != EINTR && errno != EAGAIN) {
dprintf("INET socket error: %d = %s.\n", \ dprintf("INET socket error: %d = %s.\n", \
errno, strerror(errno)); errno, strerror(errno));
logerror("recvfrom inet"); logerror("recvfrom inet");