busybox/networking/hostname.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

199 lines
5.7 KiB
C

/* vi: set sw=4 ts=4: */
/*
* Mini hostname implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
*
* Adjusted by Erik Andersen <andersen@codepoet.org> to remove
* use of long options and GNU getopt. Improved the usage info.
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
//config:config HOSTNAME
//config: bool "hostname (5.6 kb)"
//config: default y
//config: help
//config: Show or set the system's host name.
//config:
//config:config DNSDOMAINNAME
//config: bool "dnsdomainname (3.6 kb)"
//config: default y
//config: help
//config: Alias to "hostname -d".
// APPLET_NOEXEC:name main location suid_type help
//applet:IF_DNSDOMAINNAME(APPLET_NOEXEC(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
//applet:IF_HOSTNAME( APPLET_NOEXEC(hostname, hostname, BB_DIR_BIN, BB_SUID_DROP, hostname ))
//kbuild: lib-$(CONFIG_HOSTNAME) += hostname.o
//kbuild: lib-$(CONFIG_DNSDOMAINNAME) += hostname.o
//usage:#define hostname_trivial_usage
//usage: "[OPTIONS] [HOSTNAME | -F FILE]"
//usage:#define hostname_full_usage "\n\n"
//usage: "Get or set hostname or DNS domain name\n"
//usage: "\n -s Short"
//usage: "\n -i Addresses for the hostname"
//usage: "\n -d DNS domain name"
//usage: "\n -f Fully qualified domain name"
//usage: "\n -F FILE Use FILE's content as hostname"
//usage:
//usage:#define hostname_example_usage
//usage: "$ hostname\n"
//usage: "sage\n"
//usage:
//usage:#define dnsdomainname_trivial_usage NOUSAGE_STR
//usage:#define dnsdomainname_full_usage ""
#include "libbb.h"
static void do_sethostname(char *s, int isfile)
{
// if (!s)
// return;
if (isfile) {
parser_t *parser = config_open2(s, xfopen_for_read);
while (config_read(parser, &s, 1, 1, "# \t", PARSE_NORMAL & ~PARSE_GREEDY)) {
do_sethostname(s, 0);
}
if (ENABLE_FEATURE_CLEAN_UP)
config_close(parser);
} else if (sethostname(s, strlen(s))) {
// if (errno == EPERM)
// bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
bb_perror_msg_and_die("sethostname");
}
}
/* Manpage circa 2009:
*
* hostname [-v] [-a] [--alias] [-d] [--domain] [-f] [--fqdn] [--long]
* [-i] [--ip-address] [-s] [--short] [-y] [--yp] [--nis]
*
* hostname [-v] [-F filename] [--file filename] / [hostname]
*
* domainname [-v] [-F filename] [--file filename] / [name]
* { bbox: not supported }
*
* nodename [-v] [-F filename] [--file filename] / [name]
* { bbox: not supported }
*
* dnsdomainname [-v]
* { bbox: supported: Linux kernel build needs this }
* nisdomainname [-v]
* { bbox: not supported }
* ypdomainname [-v]
* { bbox: not supported }
*
* -a, --alias
* Display the alias name of the host (if used).
* { bbox: not supported }
* -d, --domain
* Display the name of the DNS domain. Don't use the command
* domainname to get the DNS domain name because it will show the
* NIS domain name and not the DNS domain name. Use dnsdomainname
* instead.
* -f, --fqdn, --long
* Display the FQDN (Fully Qualified Domain Name). A FQDN consists
* of a short host name and the DNS domain name. Unless you are
* using bind or NIS for host lookups you can change the FQDN and
* the DNS domain name (which is part of the FQDN) in the
* /etc/hosts file.
* -i, --ip-address
* Display the IP address(es) of the host.
* -s, --short
* Display the short host name. This is the host name cut at the
* first dot.
* -v, --verbose
* Be verbose and tell what's going on.
* { bbox: supported but ignored }
* -y, --yp, --nis
* Display the NIS domain name. If a parameter is given (or --file
* name ) then root can also set a new NIS domain.
* { bbox: not supported }
* -F, --file filename
* Read the host name from the specified file. Comments (lines
* starting with a '#') are ignored.
*/
int hostname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int hostname_main(int argc UNUSED_PARAM, char **argv)
{
enum {
OPT_d = 0x1,
OPT_f = 0x2,
OPT_i = 0x4,
OPT_s = 0x8,
OPT_F = 0x10,
OPT_dfi = 0x7,
};
unsigned opts;
char *buf;
char *hostname_str;
/* dnsdomainname from net-tools 1.60, hostname 1.100 (2001-04-14),
* supports hostname's options too (not just -v as manpage says) */
opts = getopt32(argv, "dfisF:v", &hostname_str,
"domain\0" No_argument "d"
"fqdn\0" No_argument "f"
//Enable if seen in active use in some distro:
// "long\0" No_argument "f"
// "ip-address\0" No_argument "i"
// "short\0" No_argument "s"
// "verbose\0" No_argument "v"
"file\0" No_argument "F"
);
argv += optind;
buf = safe_gethostname();
if (ENABLE_DNSDOMAINNAME) {
if (!ENABLE_HOSTNAME || applet_name[0] == 'd') {
/* dnsdomainname */
opts = OPT_d;
}
}
if (opts & OPT_dfi) {
/* Cases when we need full hostname (or its part) */
struct hostent *hp;
char *p;
hp = xgethostbyname(buf);
p = strchrnul(hp->h_name, '.');
if (opts & OPT_f) {
puts(hp->h_name);
} else if (opts & OPT_s) {
*p = '\0';
puts(hp->h_name);
} else if (opts & OPT_d) {
if (*p)
puts(p + 1);
} else /*if (opts & OPT_i)*/ {
if (hp->h_length == sizeof(struct in_addr)) {
struct in_addr **h_addr_list = (struct in_addr **)hp->h_addr_list;
while (*h_addr_list) {
printf(h_addr_list[1] ? "%s " : "%s", inet_ntoa(**h_addr_list));
h_addr_list++;
}
bb_putchar('\n');
}
}
} else if (opts & OPT_s) {
strchrnul(buf, '.')[0] = '\0';
puts(buf);
} else if (opts & OPT_F) {
/* Set the hostname */
do_sethostname(hostname_str, 1);
} else if (argv[0]) {
/* Set the hostname */
do_sethostname(argv[0], 0);
} else {
/* Just print the current hostname */
puts(buf);
}
if (ENABLE_FEATURE_CLEAN_UP)
free(buf);
return EXIT_SUCCESS;
}