Major cleanup from Charles Steinkuehler <charles@steinkuehler.net>:
- Switched to getopt argument parsing
- Added -f option to get fully qualified domain name
- Fixed the -s (short) and -d (domain) options, which were not
doing a gethostbyname lookup to get the FQDN before trying to
separate the local and domain portions of the hostname.
- Fixed probem with 'agressive setting' of the hostname...the
previous busybox version would try to set the hostname if called
with a non-option argument, or the -F option, even if another
option (like -i or -s) was given. This behavior does not match
the net-tools hostname, which does not attempt to set anything if
given a 'display' option, regardless of the presence/absence of
the -F option or additional command line arguments.
- When using a file to set the hostname, behavior now matches
net-tools version...previous busybox version did not handle
comments, and simply grabbed the first line from the file.
diff --git a/networking/hostname.c b/networking/hostname.c
index 7a26c1b..16de86a 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */
/*
- * $Id: hostname.c,v 1.31 2001/10/24 04:59:56 andersen Exp $
+ * $Id: hostname.c,v 1.32 2001/10/31 09:59:57 andersen Exp $
* Mini hostname implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -30,8 +30,12 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include <getopt.h>
#include "busybox.h"
+extern char *optarg; /* in unistd.h */
+extern int optind, opterr, optopt; /* in unistd.h */
+
static void do_sethostname(char *s, int isfile)
{
FILE *f;
@@ -48,81 +52,79 @@
}
} else {
f = xfopen(s, "r");
- fgets(buf, 255, f);
+ while (fgets(buf, 255, f) != NULL) {
+ if (buf[0] =='#') {
+ continue;
+ }
+ chomp(buf);
+ do_sethostname(buf, 0);
+ }
#ifdef CONFIG_FEATURE_CLEAN_UP
fclose(f);
#endif
- chomp(buf);
- do_sethostname(buf, 0);
}
}
int hostname_main(int argc, char **argv)
{
- int opt_short = 0;
- int opt_domain = 0;
- int opt_ip = 0;
- struct hostent *h;
+ int opt;
+ int type = 0;
+ struct hostent *hp;
char *filename = NULL;
char buf[255];
- char *s = NULL;
+ char *p = NULL;
if (argc < 1)
show_usage();
- while (--argc > 0 && **(++argv) == '-') {
- while (*(++(*argv))) {
- switch (**argv) {
- case 's':
- opt_short = 1;
- break;
- case 'i':
- opt_ip = 1;
- break;
- case 'd':
- opt_domain = 1;
- break;
- case 'F':
- if (--argc == 0) {
- show_usage();
- }
- filename = *(++argv);
- break;
- case '-':
- if (strcmp(++(*argv), "file") || --argc ==0 ) {
- show_usage();
- }
- filename = *(++argv);
- break;
- default:
- show_usage();
- }
- if (filename != NULL)
- break;
+ while ((opt = getopt(argc, argv, "dfisF:")) > 0) {
+ switch (opt) {
+ case 'd':
+ case 'f':
+ case 'i':
+ case 's':
+ type = opt;
+ break;
+ case 'F':
+ filename = optarg;
+ break;
+ default:
+ show_usage();
}
}
- if (argc >= 1) {
- do_sethostname(*argv, 0);
- } else if (filename != NULL) {
- do_sethostname(filename, 1);
- } else {
+ /* Output in desired format */
+ if (type != 0) {
gethostname(buf, 255);
- if (opt_short) {
- s = strchr(buf, '.');
- if (!s)
- s = buf;
- *s = 0;
+ hp = xgethostbyname(buf);
+ p = strchr(hp->h_name, '.');
+ if (type == 'f') {
+ puts(hp->h_name);
+ } else if (type == 's') {
+ if (p != NULL) {
+ *p = 0;
+ }
puts(buf);
- } else if (opt_domain) {
- s = strchr(buf, '.');
- puts(s ? s + 1 : "");
- } else if (opt_ip) {
- h = xgethostbyname(buf);
- puts(inet_ntoa(*(struct in_addr *) (h->h_addr)));
- } else {
- puts(buf);
+ } else if (type == 'd') {
+ puts(p ? p + 1 : "");
+ } else if (type == 'i') {
+ while (hp->h_addr_list[0]) {
+ printf("%s ", inet_ntoa(*(struct in_addr *) (*hp->h_addr_list++)));
+ }
+ printf("\n");
}
}
+ /* Set the hostname */
+ else if (filename != NULL) {
+ do_sethostname(filename, 1);
+ } else if (optind < argc) {
+ do_sethostname(argv[optind], 0);
+ }
+ /* Or if all else fails,
+ * just print the current hostname */
+ else {
+ gethostname(buf, 255);
+ puts(buf);
+ }
return(0);
}