SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timedated: be more tolerant in parsing /etc/adjtime

Browse Source 
Similarly to the previous commit, make context_write_data_local_rtc()
understand /etc/adjtime files with just one or two lines, with or without a
final newline.

Normalize the file to the current definition in hwclock(8), in the spirit of
"be liberal what you accept and strict what you produce": Add line terminators,
and set the second line to "0" if missing.

Fixes: #2638
This commit is contained in:
Martin Pitt
2016-02-26 16:03:26 +01:00
parent 35f7216f96
commit c9410dd47f
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/timedate/timedated.c
+29 -15
View File
@@ -125,30 +125,44 @@ static int context_write_data_local_rtc(Context *c) {
if (!w)
return -ENOMEM;
} else {
char *p, *e;
char *p;
char *e = (char*) "\n"; /* default if there are not 3 lines with \n terminator */
const char *prepend = "";
size_t a, b;
p = strchr(s, '\n');
if (!p)
return -EIO;
p = strchr(p+1, '\n');
if (!p)
return -EIO;
p++;
e = strchr(p, '\n');
if (!e)
return -EIO;
p = strchrnul(s, '\n');
if (*p == '\0') {
/* only one line, no \n terminator */
prepend = "\n0\n";
} else if (p[1] == '\0') {
/* only one line, with \n terminator */
++p;
prepend = "0\n";
} else {
p = strchr(p+1, '\n');
if (!p) {
/* only two lines, no \n terminator */
prepend = "\n";
p = s + strlen(s);
} else {
char *end;
/* third line might have a \n terminator or not */
p++;
end = strchr(p, '\n');
/* if we actually have a fourth line, use that as suffix "e", otherwise the default \n */
if (end)
e = end;
}
}
a = p - s;
b = strlen(e);
w = new(char, a + (c->local_rtc ? 5 : 3) + b + 1);
w = new(char, a + (c->local_rtc ? 5 : 3) + strlen(prepend) + b + 1);
if (!w)
return -ENOMEM;
*(char*) mempcpy(stpcpy(mempcpy(w, s, a), c->local_rtc ? "LOCAL" : "UTC"), e, b) = 0;
*(char*) mempcpy(stpcpy(stpcpy(mempcpy(w, s, a), prepend), c->local_rtc ? "LOCAL" : "UTC"), e, b) = 0;
if (streq(w, NULL_ADJTIME_UTC)) {
if (unlink("/etc/adjtime") < 0)