chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c9fa367
)
fstab-generator: add comma when removed option is in the middle
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Mon, 7 Jul 2014 20:10:38 +0000
(16:10 -0400)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Mon, 7 Jul 2014 20:11:41 +0000
(16:11 -0400)
xxx,x-systemd.default-timeout=y,zzz was filtered to xxxzzz,
but should be xxx,zzz, of course.
src/shared/generator.c
patch
|
blob
|
history
diff --git
a/src/shared/generator.c
b/src/shared/generator.c
index 5d5b6a0a61cc3b5d30caecd07fc6685fa9e97637..2f9e5954c20d363bb2f29024b95cf6efd9b9e1dd 100644
(file)
--- a/
src/shared/generator.c
+++ b/
src/shared/generator.c
@@
-125,7
+125,7
@@
int generator_write_timeouts(const char *dir, const char *what, const char *wher
char *prefix, *postfix;
prefix = strndupa(opts, start - opts - (start != opts));
- postfix = timeout + len + (timeout[len] != '\0');
+ postfix = timeout + len + (
start == opts &&
timeout[len] != '\0');
*filtered = strjoin(prefix, *postfix ? postfix : NULL, NULL);
if (!*filtered)
return log_oom();