2002-07-21 22:20:49 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
|
|
|
/*
|
2002-08-05 08:27:12 +05:30
|
|
|
* Mini hwclock implementation for busybox
|
|
|
|
*
|
2002-07-21 22:20:49 +05:30
|
|
|
* Copyright (C) 2002 Robert Griebl <griebl@gmx.de>
|
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
2016-11-23 16:16:32 +05:30
|
|
|
*/
|
|
|
|
//config:config HWCLOCK
|
2017-07-19 01:31:24 +05:30
|
|
|
//config: bool "hwclock (5.8 kb)"
|
2016-11-23 16:16:32 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: The hwclock utility is used to read and set the hardware clock
|
|
|
|
//config: on a system. This is primarily used to set the current time on
|
|
|
|
//config: shutdown in the hardware clock, so the hardware will keep the
|
|
|
|
//config: correct time when Linux is _not_ running.
|
2016-11-23 16:16:32 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_HWCLOCK_ADJTIME_FHS
|
|
|
|
//config: bool "Use FHS /var/lib/hwclock/adjtime"
|
|
|
|
//config: default n # util-linux-ng in Fedora 13 still uses /etc/adjtime
|
|
|
|
//config: depends on HWCLOCK
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Starting with FHS 2.3, the adjtime state file is supposed to exist
|
|
|
|
//config: at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish
|
|
|
|
//config: to use the FHS behavior, answer Y here, otherwise answer N for the
|
|
|
|
//config: classic /etc/adjtime path.
|
2016-11-23 16:16:32 +05:30
|
|
|
//config:
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
|
2016-11-23 16:16:32 +05:30
|
|
|
|
|
|
|
//applet:IF_HWCLOCK(APPLET(hwclock, BB_DIR_SBIN, BB_SUID_DROP))
|
|
|
|
|
|
|
|
//kbuild:lib-$(CONFIG_HWCLOCK) += hwclock.o
|
2002-07-21 22:20:49 +05:30
|
|
|
|
2007-05-27 00:30:18 +05:30
|
|
|
#include "libbb.h"
|
2009-09-06 16:17:55 +05:30
|
|
|
/* After libbb.h, since it needs sys/types.h on some systems */
|
|
|
|
#include <sys/utsname.h>
|
2008-02-15 07:57:19 +05:30
|
|
|
#include "rtc_.h"
|
2002-12-11 09:11:28 +05:30
|
|
|
|
2020-12-16 18:19:10 +05:30
|
|
|
|
|
|
|
//musl has no __MUSL__ or similar define to check for,
|
|
|
|
//but its <sys/types.h> has these lines:
|
|
|
|
// #define __NEED_fsblkcnt_t
|
|
|
|
// #define __NEED_fsfilcnt_t
|
|
|
|
#if defined(__linux__) && defined(__NEED_fsblkcnt_t) && defined(__NEED_fsfilcnt_t)
|
|
|
|
# define LIBC_IS_MUSL 1
|
|
|
|
# include <sys/syscall.h>
|
|
|
|
#else
|
|
|
|
# define LIBC_IS_MUSL 0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2010-01-07 13:01:46 +05:30
|
|
|
/* diff code is disabled: it's not sys/hw clock diff, it's some useless
|
|
|
|
* "time between hwclock was started and we saw CMOS tick" quantity.
|
|
|
|
* It's useless since hwclock is started at a random moment,
|
|
|
|
* thus the quantity is also random, useless. Showing 0.000000 does not
|
2010-01-07 15:06:41 +05:30
|
|
|
* deprive us from any useful info.
|
|
|
|
*
|
|
|
|
* SHOW_HWCLOCK_DIFF code in this file shows the difference between system
|
|
|
|
* and hw clock. It is useful, but not compatible with standard hwclock.
|
|
|
|
* Thus disabled.
|
|
|
|
*/
|
2010-01-07 13:01:46 +05:30
|
|
|
#define SHOW_HWCLOCK_DIFF 0
|
|
|
|
|
|
|
|
|
|
|
|
#if !SHOW_HWCLOCK_DIFF
|
|
|
|
# define read_rtc(pp_rtcname, sys_tv, utc) read_rtc(pp_rtcname, utc)
|
|
|
|
#endif
|
|
|
|
static time_t read_rtc(const char **pp_rtcname, struct timeval *sys_tv, int utc)
|
2006-11-01 15:55:35 +05:30
|
|
|
{
|
2010-01-09 23:40:49 +05:30
|
|
|
struct tm tm_time;
|
2008-02-15 07:57:19 +05:30
|
|
|
int fd;
|
2002-07-21 22:20:49 +05:30
|
|
|
|
2010-01-07 13:01:46 +05:30
|
|
|
fd = rtc_xopen(pp_rtcname, O_RDONLY);
|
2010-01-07 03:13:39 +05:30
|
|
|
|
2010-01-09 23:40:49 +05:30
|
|
|
rtc_read_tm(&tm_time, fd);
|
2010-01-07 13:01:46 +05:30
|
|
|
|
|
|
|
#if SHOW_HWCLOCK_DIFF
|
2010-01-07 15:06:41 +05:30
|
|
|
{
|
2010-01-09 23:40:49 +05:30
|
|
|
int before = tm_time.tm_sec;
|
2010-01-07 15:06:41 +05:30
|
|
|
while (1) {
|
2010-01-09 23:40:49 +05:30
|
|
|
rtc_read_tm(&tm_time, fd);
|
2010-01-07 15:06:41 +05:30
|
|
|
gettimeofday(sys_tv, NULL);
|
2012-04-17 22:55:13 +05:30
|
|
|
if (before != (int)tm_time.tm_sec)
|
2010-01-07 15:06:41 +05:30
|
|
|
break;
|
|
|
|
}
|
2010-01-07 03:13:39 +05:30
|
|
|
}
|
2010-01-07 13:01:46 +05:30
|
|
|
#endif
|
2010-01-07 03:13:39 +05:30
|
|
|
|
2010-01-06 22:46:39 +05:30
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
|
|
close(fd);
|
2004-03-15 13:59:22 +05:30
|
|
|
|
2010-01-09 23:40:49 +05:30
|
|
|
return rtc_tm2time(&tm_time, utc);
|
2002-07-21 22:20:49 +05:30
|
|
|
}
|
|
|
|
|
2010-01-07 13:01:46 +05:30
|
|
|
static void show_clock(const char **pp_rtcname, int utc)
|
2002-07-21 22:20:49 +05:30
|
|
|
{
|
2010-01-07 15:06:41 +05:30
|
|
|
#if SHOW_HWCLOCK_DIFF
|
|
|
|
struct timeval sys_tv;
|
|
|
|
#endif
|
2011-07-08 10:10:25 +05:30
|
|
|
time_t t = read_rtc(pp_rtcname, &sys_tv, utc);
|
2002-07-21 22:20:49 +05:30
|
|
|
|
2011-07-08 10:10:25 +05:30
|
|
|
#if ENABLE_LOCALE_SUPPORT
|
|
|
|
/* Standard hwclock uses locale-specific output format */
|
|
|
|
char cp[64];
|
|
|
|
struct tm *ptm = localtime(&t);
|
|
|
|
strftime(cp, sizeof(cp), "%c", ptm);
|
|
|
|
#else
|
|
|
|
char *cp = ctime(&t);
|
2015-03-13 00:48:51 +05:30
|
|
|
chomp(cp);
|
2011-07-08 10:10:25 +05:30
|
|
|
#endif
|
|
|
|
|
2010-01-07 15:06:41 +05:30
|
|
|
#if !SHOW_HWCLOCK_DIFF
|
2010-01-07 13:01:46 +05:30
|
|
|
printf("%s 0.000000 seconds\n", cp);
|
2010-01-07 15:06:41 +05:30
|
|
|
#else
|
|
|
|
{
|
|
|
|
long diff = sys_tv.tv_sec - t;
|
|
|
|
if (diff < 0 /*&& tv.tv_usec != 0*/) {
|
2011-07-08 10:10:25 +05:30
|
|
|
/* Why we need diff++? */
|
|
|
|
/* diff >= 0 is ok: | diff < 0, can't just use tv.tv_usec: */
|
|
|
|
/* 45.520820 | 43.520820 */
|
|
|
|
/* - 44.000000 | - 45.000000 */
|
|
|
|
/* = 1.520820 | = -1.479180, not -2.520820! */
|
2010-01-07 15:06:41 +05:30
|
|
|
diff++;
|
2011-07-08 10:10:25 +05:30
|
|
|
/* Should be 1000000 - tv.tv_usec, but then we must check tv.tv_usec != 0 */
|
2010-01-07 15:06:41 +05:30
|
|
|
sys_tv.tv_usec = 999999 - sys_tv.tv_usec;
|
|
|
|
}
|
|
|
|
printf("%s %ld.%06lu seconds\n", cp, diff, (unsigned long)sys_tv.tv_usec);
|
2010-01-07 03:13:39 +05:30
|
|
|
}
|
2010-01-07 13:01:46 +05:30
|
|
|
#endif
|
2002-07-21 22:20:49 +05:30
|
|
|
}
|
|
|
|
|
2020-12-16 18:19:10 +05:30
|
|
|
static void set_kernel_tz(const struct timezone *tz)
|
2002-07-21 22:20:49 +05:30
|
|
|
{
|
2020-12-16 18:19:10 +05:30
|
|
|
#if LIBC_IS_MUSL
|
|
|
|
/* musl libc does not pass tz argument to syscall
|
|
|
|
* because "it's deprecated by POSIX, therefore it's fine
|
|
|
|
* if we gratuitously break stuff" :(
|
2014-02-25 22:22:10 +05:30
|
|
|
*/
|
2020-12-16 18:19:10 +05:30
|
|
|
#if !defined(SYS_settimeofday) && defined(SYS_settimeofday_time32)
|
|
|
|
# define SYS_settimeofday SYS_settimeofday_time32
|
|
|
|
#endif
|
|
|
|
int ret = syscall(SYS_settimeofday, NULL, tz);
|
|
|
|
#else
|
|
|
|
int ret = settimeofday(NULL, tz);
|
|
|
|
#endif
|
|
|
|
if (ret)
|
2020-08-10 20:29:02 +05:30
|
|
|
bb_simple_perror_msg_and_die("settimeofday");
|
2020-12-16 18:19:10 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* At system boot, kernel may set system time from RTC,
|
|
|
|
* but it knows nothing about timezones. If RTC is in local time,
|
|
|
|
* then system time is wrong - it is offset by timezone.
|
|
|
|
* --systz option corrects system time if RTC is in local time,
|
|
|
|
* and (always) sets in-kernel timezone.
|
2020-12-17 01:25:30 +05:30
|
|
|
* (Unlike --hctosys, it does not read the RTC).
|
2020-12-16 18:19:10 +05:30
|
|
|
*
|
|
|
|
* util-linux's code has this comment:
|
|
|
|
* RTC | settimeofday calls
|
|
|
|
* ------|-------------------------------------------------
|
2020-12-17 01:25:30 +05:30
|
|
|
* Local | 1st) warps system time*, sets PCIL* and kernel tz
|
2020-12-16 18:19:10 +05:30
|
|
|
* UTC | 1st) locks warp_clock 2nd) sets kernel tz
|
|
|
|
* * only on first call after boot
|
|
|
|
* (PCIL is "persistent_clock_is_local" kernel internal flag,
|
|
|
|
* it makes kernel save RTC in local time, not UTC.)
|
|
|
|
*/
|
|
|
|
static void set_kernel_timezone_and_clock(int utc, const struct timeval *hctosys)
|
|
|
|
{
|
|
|
|
time_t cur;
|
|
|
|
struct tm *broken;
|
|
|
|
struct timezone tz = { 0 };
|
|
|
|
|
|
|
|
/* if --utc, prevent kernel's warp_clock() with a dummy call */
|
|
|
|
if (utc)
|
|
|
|
set_kernel_tz(&tz);
|
|
|
|
|
|
|
|
/* Set kernel's timezone offset based on userspace one */
|
2020-12-17 01:25:30 +05:30
|
|
|
//It's tempting to call tzset() and use libc global "timezone" variable
|
|
|
|
//...but it does NOT include DST shift (IOW: it's WRONG, usually by one hour,
|
|
|
|
//if DST is in effect!) Thus this ridiculous dance:
|
2020-12-16 18:19:10 +05:30
|
|
|
cur = time(NULL);
|
|
|
|
broken = localtime(&cur);
|
|
|
|
tz.tz_minuteswest = -broken->tm_gmtoff / 60;
|
|
|
|
/*tz.tz_dsttime = 0; already is */
|
|
|
|
set_kernel_tz(&tz); /* MIGHT warp_clock() if 1st call since boot */
|
|
|
|
|
2020-12-17 02:06:36 +05:30
|
|
|
if (hctosys) /* it's --hctosys: set time too */
|
|
|
|
xsettimeofday(hctosys);
|
2020-12-16 18:19:10 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
static void to_sys_clock(const char **pp_rtcname, int utc)
|
|
|
|
{
|
|
|
|
struct timeval tv;
|
2020-08-10 20:29:02 +05:30
|
|
|
|
2010-01-07 13:01:46 +05:30
|
|
|
tv.tv_sec = read_rtc(pp_rtcname, NULL, utc);
|
2007-06-18 00:39:05 +05:30
|
|
|
tv.tv_usec = 0;
|
2020-12-16 18:19:10 +05:30
|
|
|
return set_kernel_timezone_and_clock(utc, &tv);
|
2002-07-21 22:20:49 +05:30
|
|
|
}
|
|
|
|
|
2010-01-07 13:01:46 +05:30
|
|
|
static void from_sys_clock(const char **pp_rtcname, int utc)
|
2002-07-21 22:20:49 +05:30
|
|
|
{
|
2010-04-14 21:49:20 +05:30
|
|
|
#if 1
|
2007-06-18 00:39:05 +05:30
|
|
|
struct timeval tv;
|
2010-04-14 21:49:20 +05:30
|
|
|
struct tm tm_time;
|
|
|
|
int rtc;
|
|
|
|
|
|
|
|
rtc = rtc_xopen(pp_rtcname, O_WRONLY);
|
|
|
|
gettimeofday(&tv, NULL);
|
|
|
|
/* Prepare tm_time */
|
|
|
|
if (sizeof(time_t) == sizeof(tv.tv_sec)) {
|
|
|
|
if (utc)
|
|
|
|
gmtime_r((time_t*)&tv.tv_sec, &tm_time);
|
|
|
|
else
|
|
|
|
localtime_r((time_t*)&tv.tv_sec, &tm_time);
|
|
|
|
} else {
|
|
|
|
time_t t = tv.tv_sec;
|
|
|
|
if (utc)
|
|
|
|
gmtime_r(&t, &tm_time);
|
|
|
|
else
|
|
|
|
localtime_r(&t, &tm_time);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
/* Bloated code which tries to set hw clock with better precision.
|
|
|
|
* On x86, even though code does set hw clock within <1ms of exact
|
|
|
|
* whole seconds, apparently hw clock (at least on some machines)
|
|
|
|
* doesn't reset internal fractional seconds to 0,
|
2017-04-17 19:43:32 +05:30
|
|
|
* making all this a pointless exercise.
|
2010-04-14 21:49:20 +05:30
|
|
|
*/
|
|
|
|
/* If we see that we are N usec away from whole second,
|
|
|
|
* we'll sleep for N-ADJ usecs. ADJ corrects for the fact
|
|
|
|
* that CPU is not infinitely fast.
|
|
|
|
* On infinitely fast CPU, next wakeup would be
|
|
|
|
* on (exactly_next_whole_second - ADJ). On real CPUs,
|
|
|
|
* this difference between current time and whole second
|
|
|
|
* is less than ADJ (assuming system isn't heavily loaded).
|
|
|
|
*/
|
|
|
|
/* Small value of 256us gives very precise sync for 2+ GHz CPUs.
|
|
|
|
* Slower CPUs will fail to sync and will go to bigger
|
|
|
|
* ADJ values. qemu-emulated armv4tl with ~100 MHz
|
|
|
|
* performance ends up using ADJ ~= 4*1024 and it takes
|
|
|
|
* 2+ secs (2 tries with successively larger ADJ)
|
|
|
|
* to sync. Even straced one on the same qemu (very slow)
|
|
|
|
* takes only 4 tries.
|
|
|
|
*/
|
|
|
|
#define TWEAK_USEC 256
|
2010-01-06 22:46:39 +05:30
|
|
|
unsigned adj = TWEAK_USEC;
|
2010-04-14 21:49:20 +05:30
|
|
|
struct tm tm_time;
|
|
|
|
struct timeval tv;
|
2010-01-07 13:01:46 +05:30
|
|
|
int rtc = rtc_xopen(pp_rtcname, O_WRONLY);
|
2010-01-06 22:46:39 +05:30
|
|
|
|
|
|
|
/* Try to catch the moment when whole second is close */
|
|
|
|
while (1) {
|
|
|
|
unsigned rem_usec;
|
|
|
|
time_t t;
|
|
|
|
|
|
|
|
gettimeofday(&tv, NULL);
|
|
|
|
|
2010-01-07 03:13:39 +05:30
|
|
|
t = tv.tv_sec;
|
2010-01-06 22:46:39 +05:30
|
|
|
rem_usec = 1000000 - tv.tv_usec;
|
2010-04-14 21:49:20 +05:30
|
|
|
if (rem_usec < adj) {
|
|
|
|
/* Close enough */
|
2010-01-06 22:46:39 +05:30
|
|
|
small_rem:
|
2010-01-07 03:13:39 +05:30
|
|
|
t++;
|
2010-01-06 22:46:39 +05:30
|
|
|
}
|
|
|
|
|
2010-04-14 21:49:20 +05:30
|
|
|
/* Prepare tm_time from t */
|
2010-01-06 22:46:39 +05:30
|
|
|
if (utc)
|
2010-01-09 23:40:49 +05:30
|
|
|
gmtime_r(&t, &tm_time); /* may read /etc/xxx (it takes time) */
|
2010-01-06 22:46:39 +05:30
|
|
|
else
|
2010-01-09 23:40:49 +05:30
|
|
|
localtime_r(&t, &tm_time); /* same */
|
2010-04-14 21:49:20 +05:30
|
|
|
|
|
|
|
if (adj >= 32*1024) {
|
|
|
|
break; /* 32 ms diff and still no luck?? give up trying to sync */
|
|
|
|
}
|
2010-01-06 22:46:39 +05:30
|
|
|
|
|
|
|
/* gmtime/localtime took some time, re-get cur time */
|
|
|
|
gettimeofday(&tv, NULL);
|
|
|
|
|
2010-04-14 21:49:20 +05:30
|
|
|
if (tv.tv_sec < t /* we are still in old second */
|
|
|
|
|| (tv.tv_sec == t && tv.tv_usec < adj) /* not too far into next second */
|
2010-01-06 22:46:39 +05:30
|
|
|
) {
|
2010-04-14 21:49:20 +05:30
|
|
|
break; /* good, we are in sync! */
|
2010-01-06 22:46:39 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
rem_usec = 1000000 - tv.tv_usec;
|
2010-04-14 21:49:20 +05:30
|
|
|
if (rem_usec < adj) {
|
|
|
|
t = tv.tv_sec;
|
|
|
|
goto small_rem; /* already close to next sec, don't sleep */
|
2010-01-06 22:46:39 +05:30
|
|
|
}
|
|
|
|
|
2010-04-14 21:49:20 +05:30
|
|
|
/* Try to sync up by sleeping */
|
|
|
|
usleep(rem_usec - adj);
|
2010-01-06 22:46:39 +05:30
|
|
|
|
2010-04-14 21:49:20 +05:30
|
|
|
/* Jump to 1ms diff, then increase fast (x2): EVERY loop
|
|
|
|
* takes ~1 sec, people won't like slowly converging code here!
|
|
|
|
*/
|
|
|
|
//bb_error_msg("adj:%d tv.tv_usec:%d", adj, (int)tv.tv_usec);
|
|
|
|
if (adj < 512)
|
|
|
|
adj = 512;
|
|
|
|
/* ... and if last "overshoot" does not look insanely big,
|
|
|
|
* just use it as adj increment. This makes convergence faster.
|
|
|
|
*/
|
|
|
|
if (tv.tv_usec < adj * 8) {
|
|
|
|
adj += tv.tv_usec;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
adj *= 2;
|
|
|
|
}
|
|
|
|
/* Debug aid to find "optimal" TWEAK_USEC with nearly exact sync.
|
2010-01-06 22:46:39 +05:30
|
|
|
* Look for a value which makes tv_usec close to 999999 or 0.
|
2010-04-14 21:49:20 +05:30
|
|
|
* For 2.20GHz Intel Core 2: optimal TWEAK_USEC ~= 200
|
2010-01-06 22:46:39 +05:30
|
|
|
*/
|
2010-04-14 21:49:20 +05:30
|
|
|
//bb_error_msg("tv.tv_usec:%d", (int)tv.tv_usec);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
tm_time.tm_isdst = 0;
|
|
|
|
xioctl(rtc, RTC_SET_TIME, &tm_time);
|
2002-07-21 22:20:49 +05:30
|
|
|
|
2010-01-06 22:46:39 +05:30
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
|
|
close(rtc);
|
2002-07-21 22:20:49 +05:30
|
|
|
}
|
|
|
|
|
2020-12-17 01:25:30 +05:30
|
|
|
// hwclock from util-linux 2.36.1
|
|
|
|
// hwclock [function] [option...]
|
|
|
|
//Functions:
|
|
|
|
// -r, --show display the RTC time
|
|
|
|
// --get display drift corrected RTC time
|
|
|
|
// --set set the RTC according to --date
|
|
|
|
// -s, --hctosys set the system time from the RTC
|
|
|
|
// -w, --systohc set the RTC from the system time
|
|
|
|
// --systz send timescale configurations to the kernel
|
|
|
|
// -a, --adjust adjust the RTC to account for systematic drift
|
|
|
|
// --predict predict the drifted RTC time according to --date
|
|
|
|
//Options:
|
|
|
|
// -u, --utc the RTC timescale is UTC
|
|
|
|
// -l, --localtime the RTC timescale is Local
|
|
|
|
// -f, --rtc <file> use an alternate file to /dev/rtc0
|
|
|
|
// --directisa use the ISA bus instead of /dev/rtc0 access
|
|
|
|
// --date <time> date/time input for --set and --predict
|
|
|
|
// --delay <sec> delay used when set new RTC time
|
|
|
|
// --update-drift update the RTC drift factor
|
|
|
|
// --noadjfile do not use /etc/adjtime
|
|
|
|
// --adjfile <file> use an alternate file to /etc/adjtime
|
|
|
|
// --test dry run; implies --verbose
|
|
|
|
// -v, --verbose display more details
|
|
|
|
|
|
|
|
//usage:#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS
|
|
|
|
//usage:# define ADJTIME_PATH "/var/lib/hwclock/adjtime"
|
|
|
|
//usage:#else
|
|
|
|
//usage:# define ADJTIME_PATH "/etc/adjtime"
|
|
|
|
//usage:#endif
|
2011-01-22 23:25:32 +05:30
|
|
|
//usage:#define hwclock_trivial_usage
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
//usage: IF_LONG_OPTS(
|
2020-12-17 01:25:30 +05:30
|
|
|
//usage: "[-swul] [--systz] [-f DEV]"
|
2011-01-22 23:25:32 +05:30
|
|
|
//usage: )
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
//usage: IF_NOT_LONG_OPTS(
|
2020-12-17 01:25:30 +05:30
|
|
|
//usage: "[-swult] [-f DEV]"
|
2011-01-22 23:25:32 +05:30
|
|
|
//usage: )
|
|
|
|
//usage:#define hwclock_full_usage "\n\n"
|
2020-12-16 05:49:08 +05:30
|
|
|
//usage: "Show or set hardware clock (RTC)\n"
|
2020-12-17 01:25:30 +05:30
|
|
|
///////: "\n -r Show RTC time"
|
2020-12-16 05:49:08 +05:30
|
|
|
///////-r is default, don't bother showing it in help
|
2020-12-17 01:25:30 +05:30
|
|
|
//usage: "\n -s Set system time from RTC"
|
|
|
|
//usage: "\n -w Set RTC from system time"
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
//usage: IF_LONG_OPTS(
|
|
|
|
//usage: "\n --systz Set in-kernel timezone, correct system time"
|
2020-12-17 01:25:30 +05:30
|
|
|
//usage: "\n if RTC is kept in local time"
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
//usage: )
|
2020-12-17 01:25:30 +05:30
|
|
|
//usage: "\n -f DEV Use specified device (e.g. /dev/rtc2)"
|
|
|
|
//usage: "\n -u Assume RTC is kept in UTC"
|
|
|
|
//usage: "\n -l Assume RTC is kept in local time"
|
|
|
|
//usage: "\n (if neither is given, read from "ADJTIME_PATH")"
|
2011-01-22 23:25:32 +05:30
|
|
|
|
2020-12-17 01:25:30 +05:30
|
|
|
//TODO: get rid of incompatible -t alias to --systz?
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
|
2006-11-01 15:55:35 +05:30
|
|
|
#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
|
2011-01-22 23:25:32 +05:30
|
|
|
#define HWCLOCK_OPT_SYSTZ 0x20
|
|
|
|
#define HWCLOCK_OPT_RTCFILE 0x40
|
2004-02-22 14:41:33 +05:30
|
|
|
|
2007-10-11 15:35:36 +05:30
|
|
|
int hwclock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2008-07-05 14:48:54 +05:30
|
|
|
int hwclock_main(int argc UNUSED_PARAM, char **argv)
|
2002-07-21 22:20:49 +05:30
|
|
|
{
|
2010-01-07 13:01:46 +05:30
|
|
|
const char *rtcname = NULL;
|
2006-10-04 02:30:06 +05:30
|
|
|
unsigned opt;
|
2004-03-23 02:57:39 +05:30
|
|
|
int utc;
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
#if ENABLE_LONG_OPTS
|
2007-08-13 02:28:27 +05:30
|
|
|
static const char hwclock_longopts[] ALIGN1 =
|
2020-12-17 01:25:30 +05:30
|
|
|
"localtime\0" No_argument "l"
|
2007-07-23 22:44:14 +05:30
|
|
|
"utc\0" No_argument "u"
|
|
|
|
"show\0" No_argument "r"
|
|
|
|
"hctosys\0" No_argument "s"
|
|
|
|
"systohc\0" No_argument "w"
|
2011-01-22 23:25:32 +05:30
|
|
|
"systz\0" No_argument "t" /* short opt is non-standard */
|
|
|
|
"rtc\0" Required_argument "f"
|
2007-07-24 21:24:42 +05:30
|
|
|
;
|
2002-07-21 22:20:49 +05:30
|
|
|
#endif
|
2017-08-09 01:25:02 +05:30
|
|
|
opt = getopt32long(argv,
|
2020-12-17 01:25:30 +05:30
|
|
|
"^""lurswtf:v" /* -v is accepted and ignored */
|
|
|
|
"\0"
|
|
|
|
"r--wst:w--rst:s--wrt:t--rsw:l--u:u--l",
|
2017-08-09 01:25:02 +05:30
|
|
|
hwclock_longopts,
|
|
|
|
&rtcname
|
|
|
|
);
|
2002-07-21 22:20:49 +05:30
|
|
|
|
2020-12-17 01:25:30 +05:30
|
|
|
/* If -u or -l wasn't given, check if we are using utc */
|
2005-04-16 10:18:48 +05:30
|
|
|
if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME))
|
2008-02-15 07:57:19 +05:30
|
|
|
utc = (opt & HWCLOCK_OPT_UTC);
|
2004-03-23 02:57:39 +05:30
|
|
|
else
|
2008-02-15 07:57:19 +05:30
|
|
|
utc = rtc_adjtime_is_utc();
|
2005-04-16 10:18:48 +05:30
|
|
|
|
2008-02-15 07:57:19 +05:30
|
|
|
if (opt & HWCLOCK_OPT_HCTOSYS)
|
2010-01-07 13:01:46 +05:30
|
|
|
to_sys_clock(&rtcname, utc);
|
2008-02-15 07:57:19 +05:30
|
|
|
else if (opt & HWCLOCK_OPT_SYSTOHC)
|
2010-01-07 13:01:46 +05:30
|
|
|
from_sys_clock(&rtcname, utc);
|
2011-01-22 23:25:32 +05:30
|
|
|
else if (opt & HWCLOCK_OPT_SYSTZ)
|
2020-12-16 18:19:10 +05:30
|
|
|
set_kernel_timezone_and_clock(utc, NULL);
|
2008-02-15 07:57:19 +05:30
|
|
|
else
|
|
|
|
/* default HWCLOCK_OPT_SHOW */
|
2010-01-07 13:01:46 +05:30
|
|
|
show_clock(&rtcname, utc);
|
2008-02-15 07:57:19 +05:30
|
|
|
|
2007-06-18 00:39:05 +05:30
|
|
|
return 0;
|
2002-07-21 22:20:49 +05:30
|
|
|
}
|