chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl: reword error message
[elogind.git]
/
src
/
activate
/
activate.c
diff --git
a/src/activate/activate.c
b/src/activate/activate.c
index be40be48a453855d9522ae1f8e6df0ce5ba9625b..a6e72485749783c1a95ec9ec5692b92dad1a63bf 100644
(file)
--- a/
src/activate/activate.c
+++ b/
src/activate/activate.c
@@
-164,7
+164,7
@@
static int open_sockets(int *epoll_fd, bool accept) {
return count;
}
return count;
}
-static int launch(char* name, char **argv, char **env
iron
, int fds) {
+static int launch(char* name, char **argv, char **env, int fds) {
unsigned n_env = 0, length;
char **envp = NULL, **s;
static const char* tocopy[] = {"TERM=", "PATH=", "USER=", "HOME="};
unsigned n_env = 0, length;
char **envp = NULL, **s;
static const char* tocopy[] = {"TERM=", "PATH=", "USER=", "HOME="};
@@
-182,14
+182,14
@@
static int launch(char* name, char **argv, char **environ, int fds) {
char _cleanup_free_ *p = strappend(*s, "=");
if (!p)
return log_oom();
char _cleanup_free_ *p = strappend(*s, "=");
if (!p)
return log_oom();
- envp[n_env] = strv_find_prefix(env
iron
, p);
+ envp[n_env] = strv_find_prefix(env, p);
if (envp[n_env])
n_env ++;
}
}
for (i = 0; i < ELEMENTSOF(tocopy); i++) {
if (envp[n_env])
n_env ++;
}
}
for (i = 0; i < ELEMENTSOF(tocopy); i++) {
- envp[n_env] = strv_find_prefix(env
iron
, tocopy[i]);
+ envp[n_env] = strv_find_prefix(env, tocopy[i]);
if (envp[n_env])
n_env ++;
}
if (envp[n_env])
n_env ++;
}
@@
-208,7
+208,7
@@
static int launch(char* name, char **argv, char **environ, int fds) {
return -errno;
}
return -errno;
}
-static int launch1(const char* child, char** argv, char **env
iron
, int fd) {
+static int launch1(const char* child, char** argv, char **env, int fd) {
pid_t parent_pid, child_pid;
int r;
pid_t parent_pid, child_pid;
int r;