static char** arg_listen = NULL;
static bool arg_accept = false;
static char** arg_args = NULL;
+static char** arg_environ = NULL;
static int add_epoll(int epoll_fd, int fd) {
int r;
return r;
}
-static int set_nocloexec(int fd) {
- int flags;
-
- flags = fcntl(fd, F_GETFD);
- if (flags < 0) {
- log_error("Querying flags for fd:%d: %m", fd);
- return -errno;
- }
-
- if (!(flags & FD_CLOEXEC))
- return 0;
-
- if (fcntl(fd, F_SETFD, flags & ~FD_CLOEXEC) < 0) {
- log_error("Settings flags for fd:%d: %m", fd);
- return -errno;
- }
-
- return 0;
-}
-
static int print_socket(const char* desc, int fd) {
int r;
SocketAddress addr = {
return 0;
}
+static int make_socket_fd(const char* address, int flags) {
+ _cleanup_free_ char *p = NULL;
+ SocketAddress a;
+ int fd, r;
+
+ r = socket_address_parse(&a, address);
+ if (r < 0) {
+ log_error("Failed to parse socket: %s", strerror(-r));
+ return r;
+ }
+
+ fd = socket_address_listen(&a, flags, SOMAXCONN, SOCKET_ADDRESS_DEFAULT, NULL, false, false, 0755, 0644, NULL);
+ if (fd < 0) {
+ log_error("Failed to listen: %s", strerror(-r));
+ return fd;
+ }
+
+ r = socket_address_print(&a, &p);
+ if (r < 0) {
+ log_error("socket_address_print(): %s", strerror(-r));
+ close_nointr_nofail(fd);
+ return r;
+ }
+
+ log_info("Listening on %s", p);
+
+ return fd;
+}
+
static int open_sockets(int *epoll_fd, bool accept) {
- int n, fd;
+ int n, fd, r;
int count = 0;
char **address;
log_debug("Received descriptor fd:%d", fd);
print_socket("Listening on", fd);
- if (!arg_accept) {
- int r = set_nocloexec(fd);
- if (r < 0)
- return r;
- }
+ r = fd_cloexec(fd, arg_accept);
+ if (r < 0)
+ return r;
count ++;
}
+ /** Note: we leak some fd's on error here. I doesn't matter
+ * much, since the program will exit immediately anyway, but
+ * would be a pain to fix.
+ */
+
STRV_FOREACH(address, arg_listen) {
log_info("Opening address %s", *address);
return fd;
}
+ assert(fd == SD_LISTEN_FDS_START + count);
count ++;
}
return -errno;
}
+
for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + count; fd++) {
- int r = add_epoll(*epoll_fd, fd);
+ r = add_epoll(*epoll_fd, fd);
if (r < 0)
return r;
}
return count;
}
-static int launch(char* name, char **argv, char **environ, int fds) {
- unsigned n_env = 0;
- char* envp[7] = {NULL}; /* PATH, TERM, HOME, USER, LISTEN_FDS, LISTEN_PID */
+static int launch(char* name, char **argv, char **env, int fds) {
+ unsigned n_env = 0, length;
+ _cleanup_strv_free_ char **envp = NULL;
+ char **s;
static const char* tocopy[] = {"TERM=", "PATH=", "USER=", "HOME="};
- char _cleanup_free_ *tmp = NULL;
+ _cleanup_free_ char *tmp = NULL;
unsigned i;
+ length = strv_length(arg_environ);
+ /* PATH, TERM, HOME, USER, LISTEN_FDS, LISTEN_PID, NULL */
+ envp = new0(char *, length + 7);
+
+ STRV_FOREACH(s, arg_environ) {
+ if (strchr(*s, '='))
+ envp[n_env++] = *s;
+ else {
+ _cleanup_free_ char *p = strappend(*s, "=");
+ if (!p)
+ return log_oom();
+ envp[n_env] = strv_find_prefix(env, p);
+ if (envp[n_env])
+ n_env ++;
+ }
+ }
+
for (i = 0; i < ELEMENTSOF(tocopy); i++) {
- envp[n_env] = strv_find_prefix(environ, tocopy[i]);
+ envp[n_env] = strv_find_prefix(env, tocopy[i]);
if (envp[n_env])
n_env ++;
}
return -errno;
}
-static int launch1(const char* child, char** argv, char **environ, int fd) {
+static int launch1(const char* child, char** argv, char **env, int fd) {
pid_t parent_pid, child_pid;
int r;
- char _cleanup_free_ *tmp = NULL;
+ _cleanup_free_ char *tmp = NULL;
tmp = strv_join(argv, " ");
if (!tmp)
return log_oom();
}
/* SIGCHLD handler. */
-static void sigchld_hdl(int sig, siginfo_t *t, void *data)
-{
+static void sigchld_hdl(int sig, siginfo_t *t, void *data) {
log_info("Child %d died with code %d", t->si_pid, t->si_status);
- /* Wait for a dead child. */
- waitpid(t->si_pid, NULL, 0);
+ /* Wait for a dead child. */
+ waitpid(t->si_pid, NULL, 0);
}
static int install_chld_handler(void) {
int r;
- struct sigaction act;
+ struct sigaction act;
zero(act);
act.sa_flags = SA_SIGINFO;
act.sa_sigaction = sigchld_hdl;
{ "version", no_argument, NULL, ARG_VERSION },
{ "listen", required_argument, NULL, 'l' },
{ "accept", no_argument, NULL, 'a' },
- { NULL, 0, NULL, 0 }
+ { "environment", required_argument, NULL, 'E' },
+ {}
};
int c;
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "+hl:sa", options, NULL)) >= 0)
+ while ((c = getopt_long(argc, argv, "+hl:saE:", options, NULL)) >= 0)
switch(c) {
case 'h':
- help();
- return 0 /* done */;
+ return help();
case ARG_VERSION:
puts(PACKAGE_STRING);
arg_accept = true;
break;
+ case 'E': {
+ int r = strv_extend(&arg_environ, optarg);
+ if (r < 0)
+ return r;
+
+ break;
+ }
+
case '?':
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
if (optind == argc) {
int r, n;
int epoll_fd = -1;
- log_set_max_level(LOG_DEBUG);
- log_show_color(true);
log_parse_environment();
+ log_open();
r = parse_argv(argc, argv);
if (r <= 0)
if (n < 0)
return EXIT_FAILURE;
- while (true) {
+ for (;;) {
struct epoll_event event;
r = epoll_wait(epoll_fd, &event, 1, -1);
~ianmdlvl / elogind.git / blobdiff