X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fhwclock.c;h=3d28364e99bb4cc65ab0ed391359327f56edc98b;hb=aafbae618126835c006ae0be96959540d5b8f5af;hp=5b990df0cb6b15f7b66165f89936d84ceb549178;hpb=f704b27b5bb8bd5acaed9464714db34ccef06cc8;p=oweals%2Fbusybox.git diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index 5b990df0c..3d28364e9 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c @@ -4,227 +4,124 @@ * * Copyright (C) 2002 Robert Griebl * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ - -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include "busybox.h" - -/* Copied from linux/rtc.h to eliminate the kernel dependency */ -struct linux_rtc_time { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; - -#define RTC_SET_TIME _IOW('p', 0x0a, struct linux_rtc_time) /* Set RTC time */ -#define RTC_RD_TIME _IOR('p', 0x09, struct linux_rtc_time) /* Read RTC time */ - -#ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS +#include "libbb.h" +#include "rtc_.h" + +#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS # ifndef _GNU_SOURCE # define _GNU_SOURCE # endif #endif +static const char *rtcname; + static time_t read_rtc(int utc) { - int rtc; - struct tm tm; - char *oldtz = 0; - time_t t = 0; - - if (( rtc = open ( "/dev/rtc", O_RDONLY )) < 0 ) { - if (( rtc = open ( "/dev/misc/rtc", O_RDONLY )) < 0 ) - bb_perror_msg_and_die ( "Could not access RTC" ); - } - memset ( &tm, 0, sizeof( struct tm )); - if ( ioctl ( rtc, RTC_RD_TIME, &tm ) < 0 ) - bb_perror_msg_and_die ( "Could not read time from RTC" ); - tm. tm_isdst = -1; // not known - - close ( rtc ); - - if ( utc ) { - oldtz = getenv ( "TZ" ); - setenv ( "TZ", "UTC 0", 1 ); - tzset ( ); - } - - t = mktime ( &tm ); - - if ( utc ) { - if ( oldtz ) - setenv ( "TZ", oldtz, 1 ); - else - unsetenv ( "TZ" ); - tzset ( ); - } - return t; + time_t ret; + int fd; + + fd = rtc_xopen(&rtcname, O_RDONLY); + ret = rtc_read_time(fd, utc); + close(fd); + + return ret; } static void write_rtc(time_t t, int utc) { - int rtc; struct tm tm; + int rtc = rtc_xopen(&rtcname, O_WRONLY); - if (( rtc = open ( "/dev/rtc", O_WRONLY )) < 0 ) { - if (( rtc = open ( "/dev/misc/rtc", O_WRONLY )) < 0 ) - bb_perror_msg_and_die ( "Could not access RTC" ); - } - - tm = *( utc ? gmtime ( &t ) : localtime ( &t )); - tm. tm_isdst = 0; + tm = *(utc ? gmtime(&t) : localtime(&t)); + tm.tm_isdst = 0; - if ( ioctl ( rtc, RTC_SET_TIME, &tm ) < 0 ) - bb_perror_msg_and_die ( "Could not set the RTC time" ); + xioctl(rtc, RTC_SET_TIME, &tm); - close ( rtc ); + close(rtc); } -static int show_clock(int utc) +static void show_clock(int utc) { - struct tm *ptm; + //struct tm *ptm; time_t t; - char buffer [64]; + char *cp; - t = read_rtc ( utc ); - ptm = localtime ( &t ); /* Sets 'tzname[]' */ + t = read_rtc(utc); + //ptm = localtime(&t); /* Sets 'tzname[]' */ - safe_strncpy ( buffer, ctime ( &t ), sizeof( buffer )); - if ( buffer [0] ) - buffer [bb_strlen ( buffer ) - 1] = 0; + cp = ctime(&t); + if (cp[0]) + cp[strlen(cp) - 1] = '\0'; - //printf ( "%s %.6f seconds %s\n", buffer, 0.0, utc ? "" : ( ptm-> tm_isdst ? tzname [1] : tzname [0] )); - printf ( "%s %.6f seconds\n", buffer, 0.0 ); - - return 0; + //printf("%s %.6f seconds %s\n", cp, 0.0, utc ? "" : (ptm->tm_isdst ? tzname[1] : tzname[0])); + printf("%s 0.000000 seconds\n", cp); } -static int to_sys_clock(int utc) +static void to_sys_clock(int utc) { - struct timeval tv = { 0, 0 }; + struct timeval tv; const struct timezone tz = { timezone/60 - 60*daylight, 0 }; - tv. tv_sec = read_rtc ( utc ); - - if ( settimeofday ( &tv, &tz )) - bb_perror_msg_and_die ( "settimeofday() failed" ); - - return 0; + tv.tv_sec = read_rtc(utc); + tv.tv_usec = 0; + if (settimeofday(&tv, &tz)) + bb_perror_msg_and_die("settimeofday() failed"); } -static int from_sys_clock(int utc) +static void from_sys_clock(int utc) { - struct timeval tv = { 0, 0 }; - struct timezone tz = { 0, 0 }; - - if ( gettimeofday ( &tv, &tz )) - bb_perror_msg_and_die ( "gettimeofday() failed" ); + struct timeval tv; - write_rtc ( tv. tv_sec, utc ); - return 0; + gettimeofday(&tv, NULL); + //if (gettimeofday(&tv, NULL)) + // bb_perror_msg_and_die("gettimeofday() failed"); + write_rtc(tv.tv_sec, utc); } -#ifdef CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS -# define ADJTIME_PATH "/var/lib/hwclock/adjtime" -#else -# define ADJTIME_PATH "/etc/adjtime" -#endif -static int check_utc(void) -{ - int utc = 0; - FILE *f = fopen ( ADJTIME_PATH, "r" ); - - if ( f ) { - char buffer [128]; +#define HWCLOCK_OPT_LOCALTIME 0x01 +#define HWCLOCK_OPT_UTC 0x02 +#define HWCLOCK_OPT_SHOW 0x04 +#define HWCLOCK_OPT_HCTOSYS 0x08 +#define HWCLOCK_OPT_SYSTOHC 0x10 +#define HWCLOCK_OPT_RTCFILE 0x20 - while ( fgets ( buffer, sizeof( buffer ), f )) { - int len = bb_strlen ( buffer ); - - while ( len && isspace ( buffer [len - 1] )) - len--; - - buffer [len] = 0; - - if ( strncmp ( buffer, "UTC", 3 ) == 0 ) { - utc = 1; - break; - } - } - fclose ( f ); - } - return utc; -} - -#define HWCLOCK_OPT_LOCALTIME 0x01 -#define HWCLOCK_OPT_UTC 0x02 -#define HWCLOCK_OPT_SHOW 0x04 -#define HWCLOCK_OPT_HCTOSYS 0x08 -#define HWCLOCK_OPT_SYSTOHC 0x10 - -extern int hwclock_main ( int argc, char **argv ) +int hwclock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int hwclock_main(int argc UNUSED_PARAM, char **argv) { - unsigned long opt; + unsigned opt; int utc; -#ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS -static const struct option hwclock_long_options[] = { - { "localtime", 0, 0, 'l' }, - { "utc", 0, 0, 'u' }, - { "show", 0, 0, 'r' }, - { "hctosys", 0, 0, 's' }, - { "systohc", 0, 0, 'w' }, - { 0, 0, 0, 0 } - }; - bb_applet_long_options = hwclock_long_options; +#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS + static const char hwclock_longopts[] ALIGN1 = + "localtime\0" No_argument "l" + "utc\0" No_argument "u" + "show\0" No_argument "r" + "hctosys\0" No_argument "s" + "systohc\0" No_argument "w" + "file\0" Required_argument "f" + ; + applet_long_options = hwclock_longopts; #endif - - bb_opt_complementally = "?:r--ws:w--rs:s--wr:l--u:u--l"; - opt = bb_getopt_ulflags(argc, argv, "lursw"); + opt_complementary = "r--ws:w--rs:s--wr:l--u:u--l"; + opt = getopt32(argv, "lurswf:", &rtcname); /* If -u or -l wasn't given check if we are using utc */ if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME)) - utc = opt & HWCLOCK_OPT_UTC; + utc = (opt & HWCLOCK_OPT_UTC); + else + utc = rtc_adjtime_is_utc(); + + if (opt & HWCLOCK_OPT_HCTOSYS) + to_sys_clock(utc); + else if (opt & HWCLOCK_OPT_SYSTOHC) + from_sys_clock(utc); else - utc = check_utc(); - - if (opt & HWCLOCK_OPT_HCTOSYS) { - return to_sys_clock ( utc ); - } - else if (opt & HWCLOCK_OPT_SYSTOHC) { - return from_sys_clock ( utc ); - } else { /* default HWCLOCK_OPT_SHOW */ - return show_clock ( utc ); - } + show_clock(utc); + + return 0; }