X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Factivate%2Factivate.c;h=83d25b13af9063e4c875c95e51b48c4e160644fd;hb=7fb3ee51c1b37738fd0ea2c81dfd6c336144698a;hp=a6e72485749783c1a95ec9ec5692b92dad1a63bf;hpb=23ea3dab15181a3966ec45fa2ccbb81e59d2e0a7;p=elogind.git

diff --git a/src/activate/activate.c b/src/activate/activate.c
index a6e724857..83d25b13a 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -137,6 +137,11 @@ static int open_sockets(int *epoll_fd, bool accept) {
                 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);
 
@@ -166,9 +171,10 @@ static int open_sockets(int *epoll_fd, bool accept) {
 
 static int launch(char* name, char **argv, char **env, int fds) {
         unsigned n_env = 0, length;
-        char **envp = NULL, **s;
+        _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);
@@ -179,7 +185,7 @@ static int launch(char* name, char **argv, char **env, int fds) {
                 if (strchr(*s, '='))
                         envp[n_env++] = *s;
                 else {
-                        char _cleanup_free_ *p = strappend(*s, "=");
+                        _cleanup_free_ char *p = strappend(*s, "=");
                         if (!p)
                                 return log_oom();
                         envp[n_env] = strv_find_prefix(env, p);
@@ -212,7 +218,7 @@ 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();
@@ -284,16 +290,15 @@ static int do_accept(const char* name, char **argv, char **envp, int fd) {
 }
 
 /* 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;