From 0d7ffb9c856fe07fe3e5afa6ae563b86dbc0e2f1 Mon Sep 17 00:00:00 2001 From: J William Piggott Date: Sun, 23 Jul 2017 13:21:32 -0400 Subject: hwclock: squash custom errno strings hwclock previously used printf for custom errno messages. Later they were converted to use warn(), but were not squashed. One of the reasons for warn and errno is to avoid making translators deal with a multitude custom strings. Also the custom strings are incorrect: hwclock --hctosys hwclock: Must be superuser to set system clock. Unable to set system clock. We do not know what the system permissions are set to. The correct response is to simply say permission was denied; as the default errno string does. The second line is redundant and just adds noise the code and to logs. Patched: hwclock --hctosys hwclock: settimeofday() failed: Operation not permitted Signed-off-by: J William Piggott --- sys-utils/hwclock.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) (limited to 'sys-utils/hwclock.c') diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index aadf1964a..c74e0e264 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -648,14 +648,8 @@ set_system_clock(const struct hwclock_control *ctl, const bool hclock_valid, if (!rc) rc = settimeofday(&newtime, &tz); if (rc) { - if (errno == EPERM) { - warnx(_ - ("Must be superuser to set system clock.")); - retcode = EX_NOPERM; - } else { - warn(_("settimeofday() failed")); - retcode = 1; - } + warn(_("settimeofday() failed")); + retcode = 1; } else retcode = 0; } @@ -744,14 +738,8 @@ static int set_system_clock_timezone(const struct hwclock_control *ctl) rc = settimeofday(tv_null, &tz); if (rc) { - if (errno == EPERM) { - warnx(_ - ("Must be superuser to set system clock.")); - retcode = EX_NOPERM; - } else { - warn(_("settimeofday() failed")); - retcode = 1; - } + warn(_("settimeofday() failed")); + retcode = 1; } else retcode = 0; } @@ -1134,17 +1122,9 @@ manipulate_clock(const struct hwclock_control *ctl, const time_t set_time, adjust_drift_factor(ctl, adjtime, nowtime, hclock_valid, hclocktime); } else if (ctl->hctosys) { - rc = set_system_clock(ctl, hclock_valid, hclocktime); - if (rc) { - printf(_("Unable to set system clock.\n")); - return rc; - } + return set_system_clock(ctl, hclock_valid, hclocktime); } else if (ctl->systz) { - rc = set_system_clock_timezone(ctl); - if (rc) { - printf(_("Unable to set system clock.\n")); - return rc; - } + return set_system_clock_timezone(ctl); } else if (ctl->predict) { hclocktime = time_inc(hclocktime, (double) -(tdrift.tv_sec + tdrift.tv_usec / 1E6)); -- cgit v1.2.3-55-g7522