X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fexecute.c;h=2c13d1f9f60e8a8c9d7f7e0e15844f33bebc7d2c;hb=ee531d949c2f62374fc109252f8cbe61c2b8ee39;hp=f7353579e9ff4fa517c8d3e19ed1ace52618b7dd;hpb=e62d8c3944745ed276e6d4f33153009860e5cfc5;p=elogind.git diff --git a/src/core/execute.c b/src/core/execute.c index f7353579e..2c13d1f9f 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1195,7 +1195,7 @@ int exec_spawn(ExecCommand *command, snprintf(t, sizeof(t), "%i", context->oom_score_adjust); char_array_0(t); - if (write_one_line_file("/proc/self/oom_score_adj", t) < 0) { + if (write_string_file("/proc/self/oom_score_adj", t) < 0) { err = -errno; r = EXIT_OOM_ADJUST; goto fail_child; @@ -1741,7 +1741,7 @@ int exec_context_load_environment(const ExecContext *c, char ***l) { return -EINVAL; } for (n = 0; n < count; n++) { - k = load_env_file(pglob.gl_pathv[n], &p); + k = load_env_file(pglob.gl_pathv[n], NULL, &p); if (k < 0) { if (ignore) continue;