shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

env-util: don't include files from src/core/

Browse Source
This commit is contained in:
Lennart Poettering 2014-12-23 19:04:56 +01:00
parent 3c70e3bb02
commit 039f0e70a0
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/execute.c
View File

@ -2026,6 +2026,17 @@ void exec_command_free_array(ExecCommand **c, unsigned n) {
c[i] = exec_command_free_list(c[i]); c[i] = exec_command_free_list(c[i]);
} }
typedef struct InvalidEnvInfo {
const char *unit_id;
const char *path;
} InvalidEnvInfo;
static void invalid_env(const char *p, void *userdata) {
InvalidEnvInfo *info = userdata;
log_unit_error(info->unit_id, "Ignoring invalid environment assignment '%s': %s", p, info->path);
}
int exec_context_load_environment(const ExecContext *c, const char *unit_id, char ***l) { int exec_context_load_environment(const ExecContext *c, const char *unit_id, char ***l) {
char **i, **r = NULL; char **i, **r = NULL;
@ -2082,8 +2093,14 @@ int exec_context_load_environment(const ExecContext *c, const char *unit_id, cha
return k; return k;
} }
/* Log invalid environment variables with filename */ /* Log invalid environment variables with filename */
if (p) if (p) {
p = strv_env_clean_log(p, unit_id, pglob.gl_pathv[n]); InvalidEnvInfo info = {
.unit_id = unit_id,
.path = pglob.gl_pathv[n]
};
p = strv_env_clean_with_callback(p, invalid_env, &info);
}
if (r == NULL) if (r == NULL)
r = p; r = p;

11
src/shared/env-util.c
View File

@ -28,7 +28,6 @@
#include "util.h" #include "util.h"
#include "env-util.h" #include "env-util.h"
#include "def.h" #include "def.h"
#include "unit.h"
#define VALID_CHARS_ENV_NAME \ #define VALID_CHARS_ENV_NAME \
DIGITS LETTERS \ DIGITS LETTERS \
@ -415,7 +414,7 @@ char *strv_env_get(char **l, const char *name) {
return strv_env_get_n(l, name, strlen(name)); return strv_env_get_n(l, name, strlen(name));
} }
char **strv_env_clean_log(char **e, const char *unit_id, const char *message) { char **strv_env_clean_with_callback(char **e, void (*invalid_callback)(const char *p, void *userdata), void *userdata) {
char **p, **q; char **p, **q;
int k = 0; int k = 0;
@ -424,8 +423,8 @@ char **strv_env_clean_log(char **e, const char *unit_id, const char *message) {
bool duplicate = false; bool duplicate = false;
if (!env_assignment_is_valid(*p)) { if (!env_assignment_is_valid(*p)) {
if (message) if (invalid_callback)
log_unit_error(unit_id, "Ignoring invalid environment '%s': %s", *p, message); invalid_callback(*p, userdata);
free(*p); free(*p);
continue; continue;
} }
@ -450,7 +449,3 @@ char **strv_env_clean_log(char **e, const char *unit_id, const char *message) {
return e; return e;
} }
char **strv_env_clean(char **e) {
return strv_env_clean_log(e, NULL, NULL);
}

4
src/shared/env-util.h
View File

@ -29,8 +29,8 @@ bool env_value_is_valid(const char *e);
bool env_assignment_is_valid(const char *e); bool env_assignment_is_valid(const char *e);
bool strv_env_is_valid(char **e); bool strv_env_is_valid(char **e);
char **strv_env_clean(char **l); #define strv_env_clean(l) strv_env_clean_with_callback(l, NULL, NULL)
char **strv_env_clean_log(char **e, const char *unit_id, const char *message); char **strv_env_clean_with_callback(char **l, void (*invalid_callback)(const char *p, void *userdata), void *userdata);
bool strv_env_name_or_assignment_is_valid(char **l); bool strv_env_name_or_assignment_is_valid(char **l);

2
src/test/test-fileio.c
View File

@ -90,7 +90,7 @@ static void test_parse_env_file(void) {
assert_se(streq_ptr(a[9], "ten=")); assert_se(streq_ptr(a[9], "ten="));
assert_se(a[10] == NULL); assert_se(a[10] == NULL);
strv_env_clean_log(a, NULL, "test"); strv_env_clean(a);
k = 0; k = 0;
STRV_FOREACH(i, b) { STRV_FOREACH(i, b) {