mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-27 10:25:06 +03:00
Merge pull request #2749 from martinpitt/adjtime
This commit is contained in:
commit
8f462d878c
1
.gitignore
vendored
1
.gitignore
vendored
@ -158,6 +158,7 @@
|
||||
/test-cgroup
|
||||
/test-cgroup-mask
|
||||
/test-cgroup-util
|
||||
/test-clock
|
||||
/test-compress
|
||||
/test-compress-benchmark
|
||||
/test-condition
|
||||
|
@ -1448,6 +1448,7 @@ tests += \
|
||||
test-prioq \
|
||||
test-fileio \
|
||||
test-time \
|
||||
test-clock \
|
||||
test-hashmap \
|
||||
test-set \
|
||||
test-bitmap \
|
||||
@ -1961,6 +1962,12 @@ test_time_SOURCES = \
|
||||
test_time_LDADD = \
|
||||
libshared.la
|
||||
|
||||
test_clock_SOURCES = \
|
||||
src/test/test-clock.c
|
||||
|
||||
test_clock_LDADD = \
|
||||
libshared.la
|
||||
|
||||
test_architecture_SOURCES = \
|
||||
src/test/test-architecture.c
|
||||
|
||||
|
@ -69,9 +69,12 @@ int clock_set_hwclock(const struct tm *tm) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int clock_is_localtime(void) {
|
||||
int clock_is_localtime(const char* adjtime_path) {
|
||||
_cleanup_fclose_ FILE *f;
|
||||
|
||||
if (adjtime_path == NULL)
|
||||
adjtime_path = "/etc/adjtime";
|
||||
|
||||
/*
|
||||
* The third line of adjtime is "UTC" or "LOCAL" or nothing.
|
||||
* # /etc/adjtime
|
||||
@ -79,7 +82,7 @@ int clock_is_localtime(void) {
|
||||
* 0
|
||||
* UTC
|
||||
*/
|
||||
f = fopen("/etc/adjtime", "re");
|
||||
f = fopen(adjtime_path, "re");
|
||||
if (f) {
|
||||
char line[LINE_MAX];
|
||||
bool b;
|
||||
@ -88,7 +91,8 @@ int clock_is_localtime(void) {
|
||||
fgets(line, sizeof(line), f) &&
|
||||
fgets(line, sizeof(line), f);
|
||||
if (!b)
|
||||
return -EIO;
|
||||
/* less than three lines -> default to UTC */
|
||||
return 0;
|
||||
|
||||
truncate_nl(line);
|
||||
return streq(line, "LOCAL");
|
||||
@ -96,6 +100,7 @@ int clock_is_localtime(void) {
|
||||
} else if (errno != ENOENT)
|
||||
return -errno;
|
||||
|
||||
/* adjtime not present -> default to UTC */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#include <time.h>
|
||||
|
||||
int clock_is_localtime(void);
|
||||
int clock_is_localtime(const char* adjtime_path);
|
||||
int clock_set_timezone(int *min);
|
||||
int clock_reset_timewarp(void);
|
||||
int clock_get_hwclock(struct tm *tm);
|
||||
|
@ -139,7 +139,7 @@ static int property_get_tainted(
|
||||
if (access("/proc/cgroups", F_OK) < 0)
|
||||
e = stpcpy(e, "cgroups-missing:");
|
||||
|
||||
if (clock_is_localtime() > 0)
|
||||
if (clock_is_localtime(NULL) > 0)
|
||||
e = stpcpy(e, "local-hwclock:");
|
||||
|
||||
/* remove the last ':' */
|
||||
|
@ -1375,7 +1375,7 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
if (!skip_setup) {
|
||||
if (clock_is_localtime() > 0) {
|
||||
if (clock_is_localtime(NULL) > 0) {
|
||||
int min;
|
||||
|
||||
/*
|
||||
|
95
src/test/test-clock.c
Normal file
95
src/test/test-clock.c
Normal file
@ -0,0 +1,95 @@
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright (C) 2016 Canonical Ltd.
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "macro.h"
|
||||
#include "fileio.h"
|
||||
#include "log.h"
|
||||
#include "clock-util.h"
|
||||
|
||||
static void test_clock_is_localtime(void) {
|
||||
char adjtime[] = "/tmp/test-adjtime.XXXXXX";
|
||||
int fd;
|
||||
FILE* f;
|
||||
|
||||
const struct scenario {
|
||||
const char* contents;
|
||||
int expected_result;
|
||||
} scenarios[] = {
|
||||
/* adjtime configures UTC */
|
||||
{"0.0 0 0\n0\nUTC\n", 0},
|
||||
/* adjtime configures local time */
|
||||
{"0.0 0 0\n0\nLOCAL\n", 1},
|
||||
/* no final EOL */
|
||||
{"0.0 0 0\n0\nUTC", 0},
|
||||
{"0.0 0 0\n0\nLOCAL", 1},
|
||||
/* empty value -> defaults to UTC */
|
||||
{"0.0 0 0\n0\n", 0},
|
||||
/* unknown value -> defaults to UTC */
|
||||
{"0.0 0 0\n0\nFOO\n", 0},
|
||||
/* no third line */
|
||||
{"0.0 0 0", 0},
|
||||
{"0.0 0 0\n", 0},
|
||||
{"0.0 0 0\n0", 0},
|
||||
};
|
||||
|
||||
/* without an adjtime file we default to UTC */
|
||||
assert_se(clock_is_localtime("/nonexisting/adjtime") == 0);
|
||||
|
||||
fd = mkostemp_safe(adjtime, O_WRONLY|O_CLOEXEC);
|
||||
assert(fd > 0);
|
||||
log_info("adjtime test file: %s", adjtime);
|
||||
f = fdopen(fd, "w");
|
||||
assert(f);
|
||||
|
||||
for (size_t i = 0; i < ELEMENTSOF(scenarios); ++i) {
|
||||
log_info("scenario #%zu:, expected result %i", i, scenarios[i].expected_result);
|
||||
log_info("%s", scenarios[i].contents);
|
||||
rewind(f);
|
||||
ftruncate(fd, 0);
|
||||
assert_se(write_string_stream(f, scenarios[i].contents, false) == 0);
|
||||
assert_se(clock_is_localtime(adjtime) == scenarios[i].expected_result);
|
||||
}
|
||||
|
||||
unlink(adjtime);
|
||||
}
|
||||
|
||||
/* Test with the real /etc/adjtime */
|
||||
static void test_clock_is_localtime_system(void) {
|
||||
int r;
|
||||
r = clock_is_localtime(NULL);
|
||||
|
||||
if (access("/etc/adjtime", F_OK) == 0) {
|
||||
log_info("/etc/adjtime exists, clock_is_localtime() == %i", r);
|
||||
/* if /etc/adjtime exists we expect some answer, no error or
|
||||
* crash */
|
||||
assert(r == 0 || r == 1);
|
||||
} else
|
||||
/* default is UTC if there is no /etc/adjtime */
|
||||
assert(r == 0);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
test_clock_is_localtime();
|
||||
test_clock_is_localtime_system();
|
||||
|
||||
return 0;
|
||||
}
|
@ -78,7 +78,7 @@ static int context_read_data(Context *c) {
|
||||
c->zone = t;
|
||||
t = NULL;
|
||||
|
||||
c->local_rtc = clock_is_localtime() > 0;
|
||||
c->local_rtc = clock_is_localtime(NULL) > 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -125,30 +125,44 @@ static int context_write_data_local_rtc(Context *c) {
|
||||
if (!w)
|
||||
return -ENOMEM;
|
||||
} else {
|
||||
char *p, *e;
|
||||
char *p;
|
||||
const char *e = "\n"; /* default if there is less than 3 lines */
|
||||
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)
|
||||
|
@ -122,7 +122,7 @@ int main(int argc, char *argv[]) {
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (clock_is_localtime() > 0) {
|
||||
if (clock_is_localtime(NULL) > 0) {
|
||||
log_info("The system is configured to read the RTC time in the local time zone. "
|
||||
"This mode can not be fully supported. All system time to RTC updates are disabled.");
|
||||
m->rtc_local_time = true;
|
||||
|
Loading…
Reference in New Issue
Block a user