diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-14 22:07:14 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-14 22:07:14 +0000 |
| commit | fb79a2e2cfe33002398f1898c26d8e4f341db006 (patch) | |
| tree | f5b3ee27db5bc8c9b181fbec171f8fa430a75ba5 /util-linux/hwclock.c | |
| parent | fcfaf2e18aba06dd90b16958ecfbfcfbf59ceb02 (diff) | |
| download | busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.gz busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.bz2 busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.zip | |
xioctl and friends by Tito <farmatito@tiscali.it>
function old new delta
do_iptunnel 203 977 +774
process_dev 5328 5494 +166
ioctl_or_perror - 54 +54
ioctl_or_perror_and_die - 51 +51
ioctl_alt_func - 49 +49
bb_ioctl_or_warn - 47 +47
do_add_ioctl 102 145 +43
bb_xioctl - 39 +39
print_value_on_off - 31 +31
get_lcm 105 123 +18
arp_main 2155 2167 +12
..................
zcip_main 1576 1566 -10
setlogcons_main 92 82 -10
dumpkmap_main 263 253 -10
do_get_ioctl 85 75 -10
setkeycodes_main 165 154 -11
write_table 244 232 -12
vconfig_main 318 306 -12
do_del_ioctl 93 81 -12
set_address 75 62 -13
maybe_set_utc 30 16 -14
loadfont_main 495 479 -16
slattach_main 712 695 -17
do_loadfont 191 174 -17
do_iplink 1155 1136 -19
getty_main 2583 2562 -21
fbset_main 2058 2035 -23
do_time 588 565 -23
xioctl 25 - -25
read_rtc 186 160 -26
parse_conf 1299 1270 -29
udhcp_read_interface 269 239 -30
bb_ioctl 45 - -45
bb_ioctl_alt 70 - -70
bb_ioctl_on_off 78 - -78
.rodata 129370 129018 -352
do_show 799 - -799
------------------------------------------------------------------------------
(add/remove: 6/5 grow/shrink: 13/49 up/down: 1316/-1864) Total: -548 bytes
text data bss dec hex filename
675352 2740 13968 692060 a8f5c busybox_old
674804 2740 13968 691512 a8d38 busybox_unstripped
Diffstat (limited to 'util-linux/hwclock.c')
| -rw-r--r-- | util-linux/hwclock.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index 204a103c3..8b65df6a6 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c | |||
| @@ -59,25 +59,23 @@ static time_t read_rtc(int utc) | |||
| 59 | int rtc = xopen_rtc(O_RDONLY); | 59 | int rtc = xopen_rtc(O_RDONLY); |
| 60 | 60 | ||
| 61 | memset(&tm, 0, sizeof(struct tm)); | 61 | memset(&tm, 0, sizeof(struct tm)); |
| 62 | if (ioctl(rtc, RTC_RD_TIME, &tm) < 0) | 62 | xioctl(rtc, RTC_RD_TIME, &tm); |
| 63 | bb_perror_msg_and_die("cannot read time from RTC"); | ||
| 64 | tm.tm_isdst = -1; /* not known */ | 63 | tm.tm_isdst = -1; /* not known */ |
| 65 | 64 | ||
| 66 | close(rtc); | 65 | close(rtc); |
| 67 | 66 | ||
| 68 | if (utc) { | 67 | if (utc) { |
| 69 | oldtz = getenv("TZ"); | 68 | oldtz = getenv("TZ"); |
| 70 | setenv("TZ", "UTC 0", 1); | 69 | putenv((char*)"TZ=UTC0"); |
| 71 | tzset(); | 70 | tzset(); |
| 72 | } | 71 | } |
| 73 | 72 | ||
| 74 | t = mktime(&tm); | 73 | t = mktime(&tm); |
| 75 | 74 | ||
| 76 | if (utc) { | 75 | if (utc) { |
| 76 | unsetenv("TZ"); | ||
| 77 | if (oldtz) | 77 | if (oldtz) |
| 78 | setenv("TZ", oldtz, 1); | 78 | putenv(oldtz - 3); |
| 79 | else | ||
| 80 | unsetenv("TZ"); | ||
| 81 | tzset(); | 79 | tzset(); |
| 82 | } | 80 | } |
| 83 | return t; | 81 | return t; |
| @@ -91,8 +89,7 @@ static void write_rtc(time_t t, int utc) | |||
| 91 | tm = *(utc ? gmtime(&t) : localtime(&t)); | 89 | tm = *(utc ? gmtime(&t) : localtime(&t)); |
| 92 | tm.tm_isdst = 0; | 90 | tm.tm_isdst = 0; |
| 93 | 91 | ||
| 94 | if (ioctl(rtc, RTC_SET_TIME, &tm) < 0) | 92 | xioctl(rtc, RTC_SET_TIME, &tm); |
| 95 | bb_perror_msg_and_die("cannot set the RTC time"); | ||
| 96 | 93 | ||
| 97 | close(rtc); | 94 | close(rtc); |
| 98 | } | 95 | } |