036585a911
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>
197 lines
5.6 KiB
C
197 lines
5.6 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini touch implementation for busybox
|
|
*
|
|
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org)
|
|
*
|
|
* Previous version called open() and then utime(). While this will be
|
|
* be necessary to implement -r and -t, it currently only makes things bigger.
|
|
* Also, exiting on a failure was a bug. All args should be processed.
|
|
*/
|
|
//config:config TOUCH
|
|
//config: bool "touch (5.8 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: touch is used to create or change the access and/or
|
|
//config: modification timestamp of specified files.
|
|
//config:
|
|
//config:config FEATURE_TOUCH_NODEREF
|
|
//config: bool "Add support for -h"
|
|
//config: default y
|
|
//config: depends on TOUCH
|
|
//config: help
|
|
//config: Enable touch to have the -h option.
|
|
//config: This requires libc support for lutimes() function.
|
|
//config:
|
|
//config:config FEATURE_TOUCH_SUSV3
|
|
//config: bool "Add support for SUSV3 features (-d -t -r)"
|
|
//config: default y
|
|
//config: depends on TOUCH
|
|
//config: help
|
|
//config: Enable touch to use a reference file or a given date/time argument.
|
|
|
|
//applet:IF_TOUCH(APPLET_NOFORK(touch, touch, BB_DIR_BIN, BB_SUID_DROP, touch))
|
|
|
|
//kbuild:lib-$(CONFIG_TOUCH) += touch.o
|
|
|
|
/* BB_AUDIT SUSv3 _NOT_ compliant -- options -a, -m not supported. */
|
|
/* http://www.opengroup.org/onlinepubs/007904975/utilities/touch.html */
|
|
|
|
//usage:#define touch_trivial_usage
|
|
//usage: "[-c]" IF_FEATURE_TOUCH_SUSV3(" [-d DATE] [-t DATE] [-r FILE]") " FILE..."
|
|
//usage:#define touch_full_usage "\n\n"
|
|
//usage: "Update the last-modified date on the given FILE[s]\n"
|
|
//usage: "\n -c Don't create files"
|
|
//usage: IF_FEATURE_TOUCH_NODEREF(
|
|
//usage: "\n -h Don't follow links"
|
|
//usage: )
|
|
//usage: IF_FEATURE_TOUCH_SUSV3(
|
|
//usage: "\n -d DT Date/time to use"
|
|
//usage: "\n -t DT Date/time to use"
|
|
//usage: "\n -r FILE Use FILE's date/time"
|
|
//usage: )
|
|
//usage:
|
|
//usage:#define touch_example_usage
|
|
//usage: "$ ls -l /tmp/foo\n"
|
|
//usage: "/bin/ls: /tmp/foo: No such file or directory\n"
|
|
//usage: "$ touch /tmp/foo\n"
|
|
//usage: "$ ls -l /tmp/foo\n"
|
|
//usage: "-rw-rw-r-- 1 andersen andersen 0 Apr 15 01:11 /tmp/foo\n"
|
|
|
|
/* coreutils implements:
|
|
* -a change only the access time
|
|
* -c, --no-create
|
|
* do not create any files
|
|
* -d, --date=STRING
|
|
* parse STRING and use it instead of current time
|
|
* -f (ignored, BSD compat)
|
|
* -m change only the modification time
|
|
* -h, --no-dereference
|
|
* -r, --reference=FILE
|
|
* use this file's times instead of current time
|
|
* -t STAMP
|
|
* use [[CC]YY]MMDDhhmm[.ss] instead of current time
|
|
* --time=WORD
|
|
* change the specified time: WORD is access, atime, or use
|
|
*/
|
|
|
|
#include "libbb.h"
|
|
|
|
int touch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int touch_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
int fd;
|
|
int status = EXIT_SUCCESS;
|
|
int opts;
|
|
enum {
|
|
OPT_c = (1 << 0),
|
|
OPT_r = (1 << 1) * ENABLE_FEATURE_TOUCH_SUSV3,
|
|
OPT_d = (1 << 2) * ENABLE_FEATURE_TOUCH_SUSV3,
|
|
OPT_t = (1 << 3) * ENABLE_FEATURE_TOUCH_SUSV3,
|
|
OPT_h = (1 << 4) * ENABLE_FEATURE_TOUCH_NODEREF,
|
|
};
|
|
#if ENABLE_FEATURE_TOUCH_SUSV3
|
|
# if ENABLE_LONG_OPTS
|
|
static const char touch_longopts[] ALIGN1 =
|
|
/* name, has_arg, val */
|
|
"no-create\0" No_argument "c"
|
|
"reference\0" Required_argument "r"
|
|
"date\0" Required_argument "d"
|
|
IF_FEATURE_TOUCH_NODEREF("no-dereference\0" No_argument "h")
|
|
;
|
|
# define GETOPT32 getopt32long
|
|
# define LONGOPTS ,touch_longopts
|
|
# else
|
|
# define GETOPT32 getopt32
|
|
# define LONGOPTS
|
|
# endif
|
|
char *reference_file = NULL;
|
|
char *date_str = NULL;
|
|
struct timeval timebuf[2];
|
|
timebuf[1].tv_usec = timebuf[0].tv_usec = 0;
|
|
#else
|
|
# define reference_file NULL
|
|
# define date_str NULL
|
|
# define timebuf ((struct timeval*)NULL)
|
|
# define GETOPT32 getopt32
|
|
# define LONGOPTS
|
|
#endif
|
|
|
|
/* -d and -t both set time. In coreutils,
|
|
* accepted data format differs a bit between -d and -t.
|
|
* We accept the same formats for both */
|
|
opts = GETOPT32(argv, "c" IF_FEATURE_TOUCH_SUSV3("r:d:t:")
|
|
IF_FEATURE_TOUCH_NODEREF("h")
|
|
/*ignored:*/ "fma"
|
|
LONGOPTS
|
|
IF_FEATURE_TOUCH_SUSV3(, &reference_file)
|
|
IF_FEATURE_TOUCH_SUSV3(, &date_str)
|
|
IF_FEATURE_TOUCH_SUSV3(, &date_str)
|
|
);
|
|
|
|
argv += optind;
|
|
if (!*argv) {
|
|
bb_show_usage();
|
|
}
|
|
|
|
if (reference_file) {
|
|
struct stat stbuf;
|
|
xstat(reference_file, &stbuf);
|
|
timebuf[1].tv_sec = timebuf[0].tv_sec = stbuf.st_mtime;
|
|
/* Can use .st_mtim.tv_nsec
|
|
* (or is it .st_mtimensec?? see date.c)
|
|
* to set microseconds too.
|
|
*/
|
|
}
|
|
|
|
if (date_str) {
|
|
struct tm tm_time;
|
|
time_t t;
|
|
|
|
//memset(&tm_time, 0, sizeof(tm_time));
|
|
/* Better than memset: makes "HH:MM" dates meaningful */
|
|
time(&t);
|
|
localtime_r(&t, &tm_time);
|
|
parse_datestr(date_str, &tm_time);
|
|
|
|
/* Correct any day of week and day of year etc. fields */
|
|
tm_time.tm_isdst = -1; /* Be sure to recheck dst */
|
|
t = validate_tm_time(date_str, &tm_time);
|
|
|
|
timebuf[1].tv_sec = timebuf[0].tv_sec = t;
|
|
}
|
|
|
|
do {
|
|
int result;
|
|
result = (
|
|
#if ENABLE_FEATURE_TOUCH_NODEREF
|
|
(opts & OPT_h) ? lutimes :
|
|
#endif
|
|
utimes)(*argv, (reference_file || date_str) ? timebuf : NULL);
|
|
if (result != 0) {
|
|
if (errno == ENOENT) { /* no such file? */
|
|
if (opts & OPT_c) {
|
|
/* Creation is disabled, so ignore */
|
|
continue;
|
|
}
|
|
/* Try to create the file */
|
|
fd = open(*argv, O_RDWR | O_CREAT, 0666);
|
|
if (fd >= 0) {
|
|
xclose(fd);
|
|
if (reference_file || date_str)
|
|
utimes(*argv, timebuf);
|
|
continue;
|
|
}
|
|
}
|
|
status = EXIT_FAILURE;
|
|
bb_simple_perror_msg(*argv);
|
|
}
|
|
} while (*++argv);
|
|
|
|
return status;
|
|
}
|