busybox/coreutils/uname.c
Denys Vlasenko 036585a911 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 17:09:40 +02:00

215 lines
6.6 KiB
C

/* vi: set sw=4 ts=4: */
/* uname -- print system information
* Copyright (C) 1989-1999 Free Software Foundation, Inc.
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
/* Option Example
* -s, --sysname SunOS
* -n, --nodename rocky8
* -r, --release 4.0
* -v, --version
* -m, --machine sun
* -a, --all SunOS rocky8 4.0 sun
*
* The default behavior is equivalent to '-s'.
*
* David MacKenzie <djm@gnu.ai.mit.edu>
*
* GNU coreutils 6.10:
* Option: struct Example(s):
* utsname
* field:
* -s, --kernel-name sysname Linux
* -n, --nodename nodename localhost.localdomain
* -r, --kernel-release release 2.6.29
* -v, --kernel-version version #1 SMP Sun Jan 11 20:52:37 EST 2009
* -m, --machine machine x86_64 i686
* -p, --processor (none) x86_64 i686
* -i, --hardware-platform (none) x86_64 i386
* NB: vanilla coreutils reports "unknown" -p and -i,
* x86_64 and i686/i386 shown above are Fedora's inventions.
* -o, --operating-system (none) GNU/Linux
* -a, --all: all of the above, in the order shown.
* If -p or -i is not known, don't show them
*/
/* Busyboxed by Erik Andersen
*
* Before 2003: Glenn McGrath and Manuel Novoa III
* Further size reductions.
* Mar 16, 2003: Manuel Novoa III (mjn3@codepoet.org)
* Now does proper error checking on i/o. Plus some further space savings.
* Jan 2009:
* Fix handling of -a to not print "unknown", add -o and -i support.
*/
//config:config UNAME
//config: bool "uname (3.7 kb)"
//config: default y
//config: help
//config: uname is used to print system information.
//config:
//config:config UNAME_OSNAME
//config: string "Operating system name"
//config: default "GNU/Linux"
//config: depends on UNAME
//config: help
//config: Sets the operating system name reported by uname -o. The
//config: default is "GNU/Linux".
//config:
//can't use "ARCH" for this applet, all hell breaks loose in build system :)
//config:config BB_ARCH
//config: bool "arch (1.6 kb)"
//config: default y
//config: help
//config: Same as uname -m.
// APPLET_NOFORK:name main location suid_type help
//applet:IF_UNAME(APPLET_NOFORK( uname, uname, BB_DIR_BIN, BB_SUID_DROP, uname))
//applet:IF_BB_ARCH(APPLET_NOFORK(arch, uname, BB_DIR_BIN, BB_SUID_DROP, arch))
//kbuild:lib-$(CONFIG_UNAME) += uname.o
//kbuild:lib-$(CONFIG_BB_ARCH) += uname.o
/* BB_AUDIT SUSv3 compliant */
/* http://www.opengroup.org/onlinepubs/007904975/utilities/uname.html */
//usage:#define uname_trivial_usage
//usage: "[-amnrspvio]"
//usage:#define uname_full_usage "\n\n"
//usage: "Print system information\n"
//usage: "\n -a Print all"
//usage: "\n -m The machine (hardware) type"
//usage: "\n -n Hostname"
//usage: "\n -r Kernel release"
//usage: "\n -s Kernel name (default)"
//usage: "\n -p Processor type"
//usage: "\n -v Kernel version"
//usage: "\n -i The hardware platform"
//usage: "\n -o OS name"
//usage:
//usage:#define uname_example_usage
//usage: "$ uname -a\n"
//usage: "Linux debian 2.4.23 #2 Tue Dec 23 17:09:10 MST 2003 i686 GNU/Linux\n"
//usage:#define arch_trivial_usage
//usage: ""
//usage:#define arch_full_usage "\n\n"
//usage: "Print system architecture"
#include "libbb.h"
/* After libbb.h, since it needs sys/types.h on some systems */
#include <sys/utsname.h>
typedef struct {
struct utsname name;
char processor[sizeof(((struct utsname*)NULL)->machine)];
char platform[sizeof(((struct utsname*)NULL)->machine)];
char os[sizeof(CONFIG_UNAME_OSNAME)];
} uname_info_t;
#if ENABLE_UNAME
#define options "snrvmpioa"
static const unsigned short utsname_offset[] = {
offsetof(uname_info_t, name.sysname), /* -s */
offsetof(uname_info_t, name.nodename), /* -n */
offsetof(uname_info_t, name.release), /* -r */
offsetof(uname_info_t, name.version), /* -v */
offsetof(uname_info_t, name.machine), /* -m */
offsetof(uname_info_t, processor), /* -p */
offsetof(uname_info_t, platform), /* -i */
offsetof(uname_info_t, os), /* -o */
};
#endif
int uname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
{
uname_info_t uname_info;
IF_UNAME(const char *unknown_str = "unknown";)
unsigned toprint;
toprint = (1 << 4); /* "arch" = "uname -m" */
#if ENABLE_UNAME
if (!ENABLE_BB_ARCH || applet_name[0] == 'u') {
# if ENABLE_LONG_OPTS
static const char uname_longopts[] ALIGN1 =
/* name, has_arg, val */
"all\0" No_argument "a"
"kernel-name\0" No_argument "s"
"nodename\0" No_argument "n"
"kernel-release\0" No_argument "r"
"release\0" No_argument "r"
"kernel-version\0" No_argument "v"
"machine\0" No_argument "m"
"processor\0" No_argument "p"
"hardware-platform\0" No_argument "i"
"operating-system\0" No_argument "o"
;
# endif
toprint = getopt32long(argv, options, uname_longopts);
if (argv[optind]) { /* coreutils-6.9 compat */
bb_show_usage();
}
if (toprint & (1 << 8)) { /* -a => all opts on */
toprint = (1 << 8) - 1;
unknown_str = ""; /* -a does not print unknown fields */
}
if (toprint == 0) { /* no opts => -s (sysname) */
toprint = 1;
}
} /* if "uname" */
#endif
uname(&uname_info.name); /* never fails */
#if defined(__sparc__) && defined(__linux__)
{
char *fake_sparc = getenv("FAKE_SPARC");
if (fake_sparc && (fake_sparc[0] | 0x20) == 'y') {
strcpy(uname_info.name.machine, "sparc");
}
}
#endif
if (ENABLE_BB_ARCH && (!ENABLE_UNAME || applet_name[0] == 'a')) {
puts(uname_info.name.machine);
} else {
#if ENABLE_UNAME
/* "uname" */
const char *fmt;
const unsigned short *delta;
strcpy(uname_info.processor, unknown_str);
strcpy(uname_info.platform, unknown_str);
strcpy(uname_info.os, CONFIG_UNAME_OSNAME);
# if ENABLE_FEDORA_COMPAT
/* Fedora does something like this */
strcpy(uname_info.processor, uname_info.name.machine);
strcpy(uname_info.platform, uname_info.name.machine);
if (uname_info.platform[0] == 'i'
&& uname_info.platform[1]
&& uname_info.platform[2] == '8'
&& uname_info.platform[3] == '6'
) {
uname_info.platform[1] = '3';
}
# endif
delta = utsname_offset;
fmt = " %s" + 1;
do {
if (toprint & 1) {
const char *p = (char *)(&uname_info) + *delta;
if (p[0]) {
printf(fmt, p);
fmt = " %s";
}
}
++delta;
} while (toprint >>= 1);
bb_putchar('\n');
#endif
}
fflush_stdout_and_exit(EXIT_SUCCESS); /* coreutils-6.9 compat */
}