#include "fdset.h"
#define SERVER_FD_MAX 16
-#define TIMEOUT ((int) (10*MSEC_PER_SEC))
typedef struct Stream Stream;
/* Then, add process if set */
if (read_process(&buf, &iovec[i]) > 0)
i++;
- else if (ucred && get_process_name(ucred->pid, &process) >= 0)
+ else if (ucred &&
+ ucred->pid > 0 &&
+ get_process_name(ucred->pid, &process) >= 0)
IOVEC_SET_STRING(iovec[i++], process);
/* Skip the stored PID if we have a better one */
int main(int argc, char *argv[]) {
Server server;
- int r = 3, n;
+ int r = EXIT_FAILURE, n;
if (getppid() != 1) {
log_error("This program should be invoked by init only.");
- return 1;
+ return EXIT_FAILURE;
}
if (argc > 1) {
log_error("This program does not take arguments.");
- return 1;
+ return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_KMSG);
if ((n = sd_listen_fds(true)) < 0) {
log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
- return 1;
+ return EXIT_FAILURE;
}
if (n <= 0 || n > SERVER_FD_MAX) {
log_error("No or too many file descriptors passed.");
- return 2;
+ return EXIT_FAILURE;
}
if (server_init(&server, (unsigned) n) < 0)
- return 3;
+ return EXIT_FAILURE;
log_debug("systemd-kmsg-syslogd running as pid %lu", (unsigned long) getpid());
struct epoll_event event;
int k;
- if ((k = epoll_wait(server.epoll_fd, &event, 1, TIMEOUT)) < 0) {
+ if ((k = epoll_wait(server.epoll_fd, &event, 1, -1)) < 0) {
if (errno == EINTR)
continue;
break;
}
- r = 0;
+ r = EXIT_SUCCESS;
log_debug("systemd-kmsg-syslogd stopped as pid %lu", (unsigned long) getpid());