mirror of
https://github.com/sheumann/hush.git
synced 2024-11-05 06:07:00 +00:00
084266ed52
a bug where it underflows the string a bug where it never frees parser_t struct make read_config() return 0 if parser is NULL, make config_close() accept and ignore NULL parser - eliminates many if() blocks reverse the sense of parser bit flags - negative flags are harder to grok. hexdump: revert the change to use config parser, it is BIGGER and also requires additional quirks in parser *: explicitly use PARSER_NORMAL instead of 0 function old new delta login_main 1575 1596 +21 config_close 18 29 +11 bbunpack 383 391 +8 qgravechar 106 109 +3 rtnl_tab_initialize 121 117 -4 expand 1697 1693 -4 man_main 717 712 -5 nameif_main 674 668 -6 hexdump_main 597 591 -6 read_config 217 209 -8 dnsd_main 1478 1470 -8 sysctl_main 203 189 -14 config_open2 44 25 -19 make_device 1177 1141 -36 config_read 597 549 -48 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/11 up/down: 43/-158) Total: -115 bytes
94 lines
2.1 KiB
C
94 lines
2.1 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.
|
|
*
|
|
* 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 "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)) < 0) {
|
|
if (errno == EPERM)
|
|
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
|
|
bb_perror_msg_and_die("sethostname");
|
|
}
|
|
}
|
|
|
|
int hostname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int hostname_main(int argc, char **argv)
|
|
{
|
|
enum {
|
|
OPT_d = 0x1,
|
|
OPT_f = 0x2,
|
|
OPT_i = 0x4,
|
|
OPT_s = 0x8,
|
|
OPT_F = 0x10,
|
|
OPT_dfis = 0xf,
|
|
};
|
|
|
|
char *buf;
|
|
char *hostname_str;
|
|
|
|
if (argc < 1)
|
|
bb_show_usage();
|
|
|
|
getopt32(argv, "dfisF:", &hostname_str);
|
|
argv += optind;
|
|
buf = safe_gethostname();
|
|
|
|
/* Output in desired format */
|
|
if (option_mask32 & OPT_dfis) {
|
|
struct hostent *hp;
|
|
char *p;
|
|
hp = xgethostbyname(buf);
|
|
p = strchr(hp->h_name, '.');
|
|
if (option_mask32 & OPT_f) {
|
|
puts(hp->h_name);
|
|
} else if (option_mask32 & OPT_s) {
|
|
if (p)
|
|
*p = '\0';
|
|
puts(hp->h_name);
|
|
} else if (option_mask32 & OPT_d) {
|
|
if (p)
|
|
puts(p + 1);
|
|
} else if (option_mask32 & OPT_i) {
|
|
while (hp->h_addr_list[0]) {
|
|
printf("%s ", inet_ntoa(*(struct in_addr *) (*hp->h_addr_list++)));
|
|
}
|
|
bb_putchar('\n');
|
|
}
|
|
}
|
|
/* Set the hostname */
|
|
else if (option_mask32 & OPT_F) {
|
|
do_sethostname(hostname_str, 1);
|
|
} else if (argv[0]) {
|
|
do_sethostname(argv[0], 0);
|
|
}
|
|
/* Or if all else fails,
|
|
* just print the current hostname */
|
|
else {
|
|
puts(buf);
|
|
}
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
free(buf);
|
|
return EXIT_SUCCESS;
|
|
}
|