X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fhostname.c;h=8b9314c989487c660c52a208407bd42ae98532c5;hb=68229837ff1e690190d51b74b281cfe999220e6d;hp=ef921024b972b307b53d33bbe5d6be54f7100e51;hpb=7ab9c7ee52db8759d457819f5480378fa3aa97cc;p=oweals%2Fbusybox.git

diff --git a/networking/hostname.c b/networking/hostname.c
index ef921024b..8b9314c98 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -1,11 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.8 2000/05/12 19:41:47 erik Exp $
+ * $Id: hostname.c,v 1.36 2003/07/14 21:21:01 andersen Exp $
  * Mini hostname implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
  *
- * adjusted by Erik Andersen <andersee@debian.org> to remove
+ * adjusted by Erik Andersen <andersen@codepoet.org> to remove
  * use of long options and GNU getopt.  Improved the usage info.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,29 +23,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "internal.h"
 #include <errno.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
+#include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include "busybox.h"
 
-static const char *hostname_usage =
-	"hostname [OPTION] {hostname | -F file}\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nGet or set the hostname or DNS domain name. If a hostname is given\n"
-	"(or a file with the -F parameter), the host name will be set.\n\n"
-	"Options:\n"
-	"\t-s\t\tShort\n"
+extern char *optarg; /* in unistd.h */
+extern int  optind, opterr, optopt; /* in unistd.h */
 
-	"\t-i\t\tAddresses for the hostname\n"
-	"\t-d\t\tDNS domain name\n"
-	"\t-F FILE\t\tUse the contents of FILE to specify the hostname\n"
-#endif
-	;
-
-
-void do_sethostname(char *s, int isfile)
+static void do_sethostname(char *s, int isfile)
 {
 	FILE *f;
 	char buf[255];
@@ -55,94 +46,85 @@ void do_sethostname(char *s, int isfile)
 	if (!isfile) {
 		if (sethostname(s, strlen(s)) < 0) {
 			if (errno == EPERM)
-				fprintf(stderr,
-						"hostname: you must be root to change the hostname\n");
+				bb_error_msg_and_die("you must be root to change the hostname");
 			else
-				perror("sethostname");
-			exit(1);
+				bb_perror_msg_and_die("sethostname");
 		}
 	} else {
-		if ((f = fopen(s, "r")) == NULL) {
-			perror(s);
-			exit(1);
-		} else {
-			fgets(buf, 255, f);
-			fclose(f);
-			if (buf[strlen(buf) - 1] == '\n')
-				buf[strlen(buf) - 1] = 0;
-			if (sethostname(buf, strlen(buf)) < 0) {
-				perror("sethostname");
-				exit(1);
+		f = bb_xfopen(s, "r");
+		while (fgets(buf, 255, f) != NULL) {
+			if (buf[0] =='#') {
+				continue;
 			}
+			chomp(buf);
+			do_sethostname(buf, 0);
 		}
+#ifdef CONFIG_FEATURE_CLEAN_UP
+		fclose(f);
+#endif
 	}
 }
 
 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)
-		usage(hostname_usage);
+		bb_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':
-				filename = optarg;
-				if (--argc == 0) {
-					usage(hostname_usage);
-				}
-				filename = *(++argv);
-				break;
-			default:
-				usage(hostname_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:
+			bb_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;
-			printf("%s\n", buf);
-		} else if (opt_domain) {
-			s = strchr(buf, '.');
-			printf("%s\n", (s ? s + 1 : ""));
-		} else if (opt_ip) {
-			h = gethostbyname(buf);
-			if (!h) {
-				printf("Host not found\n");
-				exit(1);
+		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(hp->h_name);
+		} else if (type == 'd') {
+			if (p) puts(p + 1);
+		} else if (type == 'i') {
+			while (hp->h_addr_list[0]) {
+				printf("%s ", inet_ntoa(*(struct in_addr *) (*hp->h_addr_list++)));
 			}
-			printf("%s\n", inet_ntoa(*(struct in_addr *) (h->h_addr)));
-		} else {
-			printf("%s\n", buf);
+			printf("\n");
 		}
 	}
-	exit(0);
+	/* 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);
 }