ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwclock: remove custom errno string 

Custom errno messages are unnecessary and problematic for translators.

hwclock --directisa
hwclock: iopl() port access failed: Operation not permitted
hwclock: root privileges may be required

The custom errno message is misleading. We do not know what
the system permissions are set to. The default errno string is
correct, and enough.

Patched:
hwclock --directisa
hwclock: iopl() port access failed: Operation not permitted

root@:~# hwclock --directisa -D
Using direct ISA access to the clock
2017-07-24 14:49:17.782716-0400

Signed-off-by: J William Piggott <elseifthen@gmx.com>
This commit is contained in:
J William Piggott 2017-07-24 14:59:07 -04:00
parent 0411a57e25
commit b3e8105837
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys-utils/hwclock-cmos.c
View File

@ -45,7 +45,6 @@
* tm_isdst >0: yes, 0: no, <0: unknown
*/
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
@ -390,12 +389,9 @@ static int get_permissions_cmos(void)
if (rc == IOPL_NOT_IMPLEMENTED) {
warnx(_("ISA port access is not implemented"));
} else if (rc != 0) {
rc = errno;
warn(_("iopl() port access failed"));
if (rc == EPERM && geteuid())
warnx(_("root privileges may be required"));
}
return rc ? 1 : 0;
return rc;
}
static struct clock_ops cmos_interface = {

1
sys-utils/hwclock.h
View File

@ -1,7 +1,6 @@
#ifndef HWCLOCK_CLOCK_H
#define HWCLOCK_CLOCK_H
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>