chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small cleanup
[elogind.git]
/
src
/
core
/
execute.c
diff --git
a/src/core/execute.c
b/src/core/execute.c
index ab508b16186dcc9b036591c8bcb2392296ef6c30..5767037acde73250f8437d0bf98e24143fc2cb3e 100644
(file)
--- a/
src/core/execute.c
+++ b/
src/core/execute.c
@@
-997,7
+997,7
@@
int exec_spawn(ExecCommand *command,
int r;
char *line;
int socket_fd;
int r;
char *line;
int socket_fd;
-
char _cleanup_strv_free_
**files_env = NULL;
+
_cleanup_strv_free_ char
**files_env = NULL;
assert(command);
assert(context);
assert(command);
assert(context);
@@
-1036,9
+1036,10
@@
int exec_spawn(ExecCommand *command,
return log_oom();
log_struct_unit(LOG_DEBUG,
return log_oom();
log_struct_unit(LOG_DEBUG,
- unit_id,
- "MESSAGE=About to execute %s", line,
- NULL);
+ unit_id,
+ "EXECUTABLE=%s", command->path,
+ "MESSAGE=About to execute: %s", line,
+ NULL);
free(line);
r = cgroup_bonding_realize_list(cgroup_bondings);
free(line);
r = cgroup_bonding_realize_list(cgroup_bondings);
@@
-1068,7
+1069,7
@@
int exec_spawn(ExecCommand *command,
const char *username = NULL, *home = NULL;
uid_t uid = (uid_t) -1;
gid_t gid = (gid_t) -1;
const char *username = NULL, *home = NULL;
uid_t uid = (uid_t) -1;
gid_t gid = (gid_t) -1;
-
char _cleanup_strv_free_
**our_env = NULL, **pam_env = NULL,
+
_cleanup_strv_free_ char
**our_env = NULL, **pam_env = NULL,
**final_env = NULL, **final_argv = NULL;
unsigned n_env = 0;
bool set_access = false;
**final_env = NULL, **final_argv = NULL;
unsigned n_env = 0;
bool set_access = false;
@@
-1361,7
+1362,7
@@
int exec_spawn(ExecCommand *command,
goto fail_child;
}
} else {
goto fail_child;
}
} else {
-
char _cleanup_free_
*d = NULL;
+
_cleanup_free_ char
*d = NULL;
if (asprintf(&d, "%s/%s",
context->root_directory ? context->root_directory : "",
if (asprintf(&d, "%s/%s",
context->root_directory ? context->root_directory : "",
@@
-1523,8
+1524,8
@@
int exec_spawn(ExecCommand *command,
log_struct_unit(LOG_DEBUG,
unit_id,
"EXECUTABLE=%s", command->path,
log_struct_unit(LOG_DEBUG,
unit_id,
"EXECUTABLE=%s", command->path,
- "MESSAGE=Executing: %s",
-
line,
NULL);
+ "MESSAGE=Executing: %s",
line,
+ NULL);
log_close();
free(line);
line = NULL;
log_close();
free(line);
line = NULL;
@@
-1726,7
+1727,7
@@
int exec_context_load_environment(const ExecContext *c, char ***l) {
int k;
bool ignore = false;
char **p;
int k;
bool ignore = false;
char **p;
-
glob_t _cleanup_globfree_
pglob = {};
+
_cleanup_globfree_ glob_t
pglob = {};
int count, n;
fn = *i;
int count, n;
fn = *i;
@@
-1770,6
+1771,9
@@
int exec_context_load_environment(const ExecContext *c, char ***l) {
strv_free(r);
return k;
}
strv_free(r);
return k;
}
+ /* Log invalid environment variables with filename */
+ if (p)
+ p = strv_env_clean_log(p, pglob.gl_pathv[n]);
if (r == NULL)
r = p;
if (r == NULL)
r = p;