Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-12 00:55:11 +00:00
Code Issues Projects Releases Wiki Activity

vda, we once had a get_chomped_line_from_file or the like. Where is that nowadays? FIXME: use it here instead of the fgets()

Browse Source 
- shrink by ~9%: use common_buf, reuse are_you_root, adopt to global option_mask32
This commit is contained in:
Bernhard Reutner-Fischer 2007-01-09 10:06:19 +00:00
parent 44c2eb23dd
commit f07fe62d89
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
networking/hostname.c
View File

@ -18,29 +18,27 @@
static void do_sethostname(char *s, int isfile) static void do_sethostname(char *s, int isfile)
{ {
FILE *f; FILE *f;
char buf[256];
if (!s) if (!s)
return; return;
if (!isfile) { if (!isfile) {
if (sethostname(s, strlen(s)) < 0) { if (sethostname(s, strlen(s)) < 0) {
if (errno == EPERM) if (errno == EPERM)
bb_error_msg_and_die("you must be root to change the hostname"); bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
else else
bb_perror_msg_and_die("sethostname"); bb_perror_msg_and_die("sethostname");
} }
} else { } else {
f = xfopen(s, "r"); f = xfopen(s, "r");
while (fgets(buf, sizeof(buf), f) != NULL) { while (fgets(bb_common_bufsiz1, sizeof(bb_common_bufsiz1), f) != NULL) {
if (buf[0] =='#') { if (bb_common_bufsiz1[0] == '#') {
continue; continue;
} }
chomp(buf); chomp(bb_common_bufsiz1);
do_sethostname(buf, 0); do_sethostname(bb_common_bufsiz1, 0);
} }
#ifdef CONFIG_FEATURE_CLEAN_UP if (ENABLE_FEATURE_CLEAN_UP)
fclose(f); fclose(f);
#endif
} }
} }
@ -55,31 +53,31 @@ int hostname_main(int argc, char **argv)
}; };
char buf[256]; char buf[256];
unsigned opt;
char *hostname_str = NULL; char *hostname_str = NULL;
if (argc < 1) if (argc < 1)
bb_show_usage(); bb_show_usage();
opt = getopt32(argc, argv, "dfisF:", &hostname_str); getopt32(argc, argv, "dfisF:", &hostname_str);
/* Output in desired format */ /* Output in desired format */
if (opt & OPT_dfis) { if (option_mask32 & OPT_dfis) {
struct hostent *hp; struct hostent *hp;
char *p; char *p;
gethostname(buf, sizeof(buf)); gethostname(buf, sizeof(buf));
hp = xgethostbyname(buf); hp = xgethostbyname(buf);
p = strchr(hp->h_name, '.'); p = strchr(hp->h_name, '.');
if (opt & OPT_f) { if (option_mask32 & OPT_f) {
puts(hp->h_name); puts(hp->h_name);
} else if (opt & OPT_s) { } else if (option_mask32 & OPT_s) {
if (p != NULL) { if (p != NULL) {
*p = 0; *p = 0;
} }
puts(hp->h_name); puts(hp->h_name);
} else if (opt & OPT_d) { } else if (option_mask32 & OPT_d) {
if (p) puts(p + 1); if (p)
} else if (opt & OPT_i) { puts(p + 1);
} else if (option_mask32 & OPT_i) {
while (hp->h_addr_list[0]) { while (hp->h_addr_list[0]) {
printf("%s ", inet_ntoa(*(struct in_addr *) (*hp->h_addr_list++))); printf("%s ", inet_ntoa(*(struct in_addr *) (*hp->h_addr_list++)));
} }