429339fe2c
- Add systemctl-options.patch: handle SYSTEMCTL_OPTIONS internaly (bnc#798620). - Update crypt-loop-file.patch to correctly detect crypto loop files (bnc#799514). - Add journalctl-remove-leftover-message.patch: remove debug message in systemctl. - Add job-avoid-recursion-when-cancelling.patch: prevent potential recursion when cancelling a service. - Add sysctl-parse-all-keys.patch: ensure sysctl file is fully parsed. - Add journal-fix-cutoff-max-date.patch: fix computation of cutoff max date for journal. - Add reword-rescue-mode-hints.patch: reword rescue prompt. - Add improve-overflow-checks.patch: improve time overflow checks. - Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour with symlinks. - Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure hostnamectl requires an argument when called with set-hostname option. - Add agetty-overrides-term.patch: pass correctly terminal type to agetty. - Add check-for-empty-strings-in-strto-conversions.patch: better check for empty strings in strto* conversions. - Add strv-cleanup-error-path-loops.patch: cleanup strv on error path. - Add cryptsetup-handle-plain.patch: correctly handle "plain" option in cryptsetup. - Add fstab-generator-improve-error-message.patch: improve error message in fstab-generator. - Add delta-accept-t-option.patch: accept -t option in OBS-URL: https://build.opensuse.org/request/show/149703 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=331
158 lines
4.9 KiB
Diff
158 lines
4.9 KiB
Diff
From 565d91fdf198b88f7c2d72c67cfc6c30341a3596 Mon Sep 17 00:00:00 2001
|
|
From: Michal Vyskocil <mvyskocil@suse.cz>
|
|
Date: Fri, 18 Jan 2013 10:05:10 +0100
|
|
Subject: [PATCH] util: continuation support for load_env_file
|
|
|
|
Variable definitions can be written on more than one line - if each ends
|
|
with a backslash, then is concatenated with a previous one. Only
|
|
backslash and unix end of line (\n) are treated as a continuation.
|
|
|
|
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=58083
|
|
|
|
[zj: squashed two patches together; cleaned up grammar; removed
|
|
comment about ignoring trailing backslash -- it is not ignored.]
|
|
|
|
Document continuation support in systemd.exec
|
|
---
|
|
man/systemd.exec.xml | 8 +++++---
|
|
src/shared/util.c | 43 ++++++++++++++++++++++++++++++++++++++-----
|
|
2 files changed, 43 insertions(+), 8 deletions(-)
|
|
|
|
Index: systemd-195/man/systemd.exec.xml
|
|
===================================================================
|
|
--- systemd-195.orig/man/systemd.exec.xml
|
|
+++ systemd-195/man/systemd.exec.xml
|
|
@@ -282,9 +282,11 @@
|
|
contain new-line separated variable
|
|
assignments. Empty lines and lines
|
|
starting with ; or # will be ignored,
|
|
- which may be used for commenting. The
|
|
- parser strips leading and
|
|
- trailing whitespace from the values
|
|
+ which may be used for commenting. A line
|
|
+ ending with a backslash will be concatenated
|
|
+ with the following one, allowing multiline variable
|
|
+ definitions. The parser strips leading
|
|
+ and trailing whitespace from the values
|
|
of assignments, unless you use
|
|
double quotes (").
|
|
The
|
|
Index: systemd-195/src/shared/util.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/shared/util.c
|
|
+++ systemd-195/src/shared/util.c
|
|
@@ -876,33 +876,55 @@ fail:
|
|
return r;
|
|
}
|
|
|
|
-int load_env_file(
|
|
- const char *fname,
|
|
- char ***rl) {
|
|
-
|
|
- FILE *f;
|
|
- char **m = NULL;
|
|
- int r;
|
|
+int load_env_file(const char *fname,
|
|
+ char ***rl) {
|
|
+
|
|
+ FILE _cleanup_fclose_ *f;
|
|
+ char *b;
|
|
+ char _cleanup_free_ *c = NULL;
|
|
+ char _cleanup_strv_free_ **m = NULL;
|
|
|
|
assert(fname);
|
|
assert(rl);
|
|
|
|
- if (!(f = fopen(fname, "re")))
|
|
+ f = fopen(fname, "re");
|
|
+ if (!f)
|
|
return -errno;
|
|
|
|
while (!feof(f)) {
|
|
- char l[LINE_MAX], *p, *u;
|
|
+ char l[LINE_MAX], *p, *u, *cs;
|
|
char **t;
|
|
|
|
if (!fgets(l, sizeof(l), f)) {
|
|
- if (feof(f))
|
|
+ if (!feof(f))
|
|
+ return -errno;
|
|
+ else if (!c)
|
|
break;
|
|
+ }
|
|
|
|
- r = -errno;
|
|
- goto finish;
|
|
+ cs = endswith(l, "\\\n");
|
|
+ if (cs) {
|
|
+ *cs = '\0';
|
|
+ b = strappend(c, l);
|
|
+ if (!b)
|
|
+ return log_oom();
|
|
+
|
|
+ free(c);
|
|
+ c = b;
|
|
+ *l = '\0';
|
|
+ continue;
|
|
}
|
|
|
|
- p = strstrip(l);
|
|
+ if (c) {
|
|
+ b = strappend(c, l);
|
|
+ if (!b)
|
|
+ return log_oom();
|
|
+
|
|
+ free(c);
|
|
+ c = b;
|
|
+ }
|
|
+
|
|
+ p = strstrip(c ? c : l);
|
|
|
|
if (!*p)
|
|
continue;
|
|
@@ -910,35 +932,27 @@ int load_env_file(
|
|
if (strchr(COMMENTS, *p))
|
|
continue;
|
|
|
|
- if (!(u = normalize_env_assignment(p))) {
|
|
- r = log_oom();
|
|
- goto finish;
|
|
- }
|
|
+ u = normalize_env_assignment(p);
|
|
+ if (!u)
|
|
+ return log_oom();
|
|
+
|
|
+ free(c);
|
|
+ c = NULL;
|
|
|
|
t = strv_append(m, u);
|
|
free(u);
|
|
|
|
- if (!t) {
|
|
- r = log_oom();
|
|
- goto finish;
|
|
- }
|
|
+ if (!t)
|
|
+ return log_oom();
|
|
|
|
strv_free(m);
|
|
m = t;
|
|
}
|
|
|
|
- r = 0;
|
|
-
|
|
*rl = m;
|
|
m = NULL;
|
|
|
|
-finish:
|
|
- if (f)
|
|
- fclose(f);
|
|
-
|
|
- strv_free(m);
|
|
-
|
|
- return r;
|
|
+ return 0;
|
|
}
|
|
|
|
int write_env_file(const char *fname, char **l) {
|