Fix compilation issue; s/-NOENT/-ENOENT/

[elogind.git] / execute.c

diff --git a/execute.c b/execute.c
index fe3dc8b251c502c33b6f2eacbfdcc880b6bbec1b..a7775a4ea9f552cdc1defeecf3ba941775373372 100644 (file)
--- a/execute.c
+++ b/execute.c
@@ -35,6 +35,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <sys/mount.h>
+#include <linux/fs.h>
 
 #include "execute.h"
 #include "strv.h"
@@ -467,7 +468,7 @@ fail:
         return r;
 }
 
-static int restore_conform_stdio(const ExecContext *context,
+static int restore_confirm_stdio(const ExecContext *context,
                                  int *saved_stdin,
                                  int *saved_stdout,
                                  bool *keep_stdin,
@@ -723,6 +724,7 @@ int exec_spawn(ExecCommand *command,
                char **argv,
                const ExecContext *context,
                int fds[], unsigned n_fds,
+               char **environment,
                bool apply_permissions,
                bool apply_chroot,
                bool confirm_spawn,
@@ -822,7 +824,7 @@ int exec_spawn(ExecCommand *command,
                         }
 
                         /* Release terminal for the question */
-                        if ((r = restore_conform_stdio(context,
+                        if ((r = restore_confirm_stdio(context,
                                                        &saved_stdin, &saved_stdout,
                                                        &keep_stdin, &keep_stdout)))
                                 goto fail;
@@ -1033,7 +1035,7 @@ int exec_spawn(ExecCommand *command,
                                 goto fail;
                         }
 
-                if (!(final_env = strv_env_merge(environ, our_env, context->environment, NULL))) {
+                if (!(final_env = strv_env_merge(environment, our_env, context->environment, NULL))) {
                         r = EXIT_MEMORY;
                         goto fail;
                 }