X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fhwclock.c;h=8fcd8c99c8fba7ad39d388e60c0b61babadc69e4;hb=10d0d4eec7e3a292917f43f72afae20341d9ba11;hp=e62a64553846a5055886ba83bc86b3a86290d535;hpb=689e4b9531380093f5d539a895c950d5a91c679c;p=oweals%2Fbusybox.git diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index e62a64553..8fcd8c99c 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c @@ -4,37 +4,16 @@ * * 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 dependancy */ +/* Copied from linux/rtc.h to eliminate the kernel dependency */ struct linux_rtc_time { int tm_sec; int tm_min; @@ -46,87 +25,91 @@ struct linux_rtc_time { 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 +#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS # ifndef _GNU_SOURCE # define _GNU_SOURCE # endif #endif -static time_t read_rtc(int utc) +static int xopen_rtc(int flags) { int rtc; + rtc = open("/dev/rtc", flags); + if (rtc < 0) { + rtc = open("/dev/misc/rtc", flags); + if (rtc < 0) + bb_perror_msg_and_die("cannot access RTC"); + } + return rtc; +} + +static time_t read_rtc(int utc) +{ struct tm tm; char *oldtz = 0; time_t t = 0; + int rtc = xopen_rtc(O_RDONLY); - 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 ( ); + memset(&tm, 0, sizeof(struct tm)); + if (ioctl(rtc, RTC_RD_TIME, &tm) < 0 ) + bb_perror_msg_and_die("cannot 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 ); + + t = mktime(&tm); + + if (utc) { + if (oldtz) + setenv("TZ", oldtz, 1); else - unsetenv ( "TZ" ); - tzset ( ); + unsetenv("TZ"); + tzset(); } return t; } static void write_rtc(time_t t, int utc) { - int rtc; struct tm tm; + int rtc = xopen_rtc(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; - - if ( ioctl ( rtc, RTC_SET_TIME, &tm ) < 0 ) - bb_perror_msg_and_die ( "Could not set the RTC time" ); - - close ( rtc ); + tm = *(utc ? gmtime(&t) : localtime(&t)); + tm.tm_isdst = 0; + + if (ioctl(rtc, RTC_SET_TIME, &tm) < 0) + bb_perror_msg_and_die("cannot set the RTC time"); + + close(rtc); } static int show_clock(int utc) { struct tm *ptm; time_t t; - char buffer [64]; - - 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; - - //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 ); - + RESERVE_CONFIG_BUFFER(buffer, 64); + + t = read_rtc(utc); + ptm = localtime(&t); /* Sets 'tzname[]' */ + + safe_strncpy(buffer, ctime(&t), 64); + if (buffer[0]) + buffer[strlen(buffer) - 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); + RELEASE_CONFIG_BUFFER(buffer); + return 0; } @@ -134,11 +117,11 @@ static int to_sys_clock(int utc) { struct timeval tv = { 0, 0 }; 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" ); + tv.tv_sec = read_rtc(utc); + + if (settimeofday(&tv, &tz)) + bb_perror_msg_and_die("settimeofday() failed"); return 0; } @@ -148,53 +131,58 @@ static int 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" ); + if (gettimeofday(&tv, &tz)) + bb_perror_msg_and_die("gettimeofday() failed"); - write_rtc ( tv. tv_sec, utc ); + write_rtc(tv.tv_sec, utc); return 0; } - +#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 ( "/var/lib/hwclock/adjtime", "r" ); - - if ( f ) { - char buffer [128]; - - while ( fgets ( buffer, sizeof( buffer ), f )) { - int len = bb_strlen ( buffer ); - - while ( len && isspace ( buffer [len - 1] )) + FILE *f = fopen(ADJTIME_PATH, "r"); + + if (f) { + RESERVE_CONFIG_BUFFER(buffer, 128); + + while (fgets(buffer, sizeof(buffer), f)) { + int len = strlen(buffer); + + while (len && isspace(buffer[len - 1])) len--; - - buffer [len] = 0; - - if ( strncmp ( buffer, "UTC", 3 ) == 0 ) { + + buffer[len] = 0; + + if (strncmp(buffer, "UTC", 3) == 0 ) { utc = 1; break; } } - fclose ( f ); + fclose(f); + RELEASE_CONFIG_BUFFER(buffer); } return utc; } -#define HWCLOCK_OPT_LOCALTIME 1 -#define HWCLOCK_OPT_UTC 8 -#define HWCLOCK_OPT_SHOW 2 -#define HWCLOCK_OPT_HCTOSYS 4 -#define HWCLOCK_OPT_SYSTOHC 16 +#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 ) { - unsigned long opt; - int utc = 0; + unsigned opt; + int utc; -#ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS -static const struct option hwclock_long_options[] = { +#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS + static const struct option hwclock_long_options[] = { { "localtime", 0, 0, 'l' }, { "utc", 0, 0, 'u' }, { "show", 0, 0, 'r' }, @@ -202,28 +190,24 @@ static const struct option hwclock_long_options[] = { { "systohc", 0, 0, 'w' }, { 0, 0, 0, 0 } }; - bb_applet_long_options = hwclock_long_options; + applet_long_options = hwclock_long_options; #endif + opt_complementary = "?:r--ws:w--rs:s--wr:l--u:u--l"; + opt = getopt32(argc, argv, "lursw"); - bb_opt_complementaly = "r~ws:w~rs:s~wr"; - opt = bb_getopt_ulflags(argc, argv, "lursw"); - /* Check only one mode was given */ - if(opt & 0x80000000UL) { - bb_show_usage(); - } - - /* If -u or -l wasnt give check if we are using utc */ - if ((opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME)) == 0) { + /* 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; + else utc = check_utc(); - } if (opt & HWCLOCK_OPT_HCTOSYS) { - return to_sys_clock ( utc ); + return to_sys_clock(utc); } else if (opt & HWCLOCK_OPT_SYSTOHC) { - return from_sys_clock ( utc ); + return from_sys_clock(utc); } else { /* default HWCLOCK_OPT_SHOW */ - return show_clock ( utc ); + return show_clock(utc); } }