X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fhostname.c;h=862bbdfa26afa021fef9bdd15d63e89f7cf561ad;hb=cd0e80ce902f6e79b31888af4ff4545846ce1c0e;hp=a00263d8f8db3d3f18dfffb6987321b18e72b53f;hpb=cb81e6484d1f50ec2761f6294722407b14add525;p=oweals%2Fbusybox.git

diff --git a/networking/hostname.c b/networking/hostname.c
index a00263d8f..862bbdfa2 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -1,6 +1,5 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $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>
@@ -8,123 +7,96 @@
  * 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
  * 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 <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"
-
-extern char *optarg; /* in unistd.h */
-extern int  optind, opterr, optopt; /* in unistd.h */
+#include "libbb.h"
 
 static void do_sethostname(char *s, int isfile)
 {
 	FILE *f;
-	char buf[255];
 
 	if (!s)
 		return;
 	if (!isfile) {
 		if (sethostname(s, strlen(s)) < 0) {
 			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
 				bb_perror_msg_and_die("sethostname");
 		}
 	} else {
-		f = bb_xfopen(s, "r");
-		while (fgets(buf, 255, f) != NULL) {
-			if (buf[0] =='#') {
+		f = xfopen(s, "r");
+#define strbuf bb_common_bufsiz1
+		while (fgets(strbuf, sizeof(strbuf), f) != NULL) {
+			if (strbuf[0] == '#') {
 				continue;
 			}
-			chomp(buf);
-			do_sethostname(buf, 0);
+			chomp(strbuf);
+			do_sethostname(strbuf, 0);
 		}
-#ifdef CONFIG_FEATURE_CLEAN_UP
-		fclose(f);
-#endif
+		if (ENABLE_FEATURE_CLEAN_UP)
+			fclose(f);
 	}
 }
 
+int hostname_main(int argc, char **argv);
 int hostname_main(int argc, char **argv)
 {
-	int opt;
-	int type = 0;
-	struct hostent *hp;
-	char *filename = NULL;
-	char buf[255];
-	char *p = NULL;
+	enum {
+		OPT_d = 0x1,
+		OPT_f = 0x2,
+		OPT_i = 0x4,
+		OPT_s = 0x8,
+		OPT_F = 0x10,
+		OPT_dfis = 0xf,
+	};
+
+	char buf[256];
+	char *hostname_str;
 
 	if (argc < 1)
 		bb_show_usage();
 
-        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();
-		}
-	}
+	getopt32(argc, argv, "dfisF:", &hostname_str);
 
 	/* Output in desired format */
-	if (type != 0) {
-		gethostname(buf, 255);
+	if (option_mask32 & OPT_dfis) {
+		struct hostent *hp;
+		char *p;
+		gethostname(buf, sizeof(buf));
 		hp = xgethostbyname(buf);
 		p = strchr(hp->h_name, '.');
-		if (type == 'f') {
+		if (option_mask32 & OPT_f) {
 			puts(hp->h_name);
-		} else if (type == 's') {
+		} else if (option_mask32 & OPT_s) {
 			if (p != NULL) {
-				*p = 0;
+				*p = '\0';
 			}
 			puts(hp->h_name);
-		} else if (type == 'd') {
-			if (p) puts(p + 1);
-		} else if (type == 'i') {
+		} 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++)));
 			}
-			printf("\n");
+			puts("");
 		}
 	}
 	/* Set the hostname */
-	else if (filename != NULL) {
-		do_sethostname(filename, 1);
+	else if (option_mask32 & OPT_F) {
+		do_sethostname(hostname_str, 1);
 	} else if (optind < argc) {
 		do_sethostname(argv[optind], 0);
 	}
 	/* Or if all else fails,
 	 * just print the current hostname */
-	 else {
-		gethostname(buf, 255);
+	else {
+		gethostname(buf, sizeof(buf));
 		puts(buf);
 	}
-	return(0);
+	return 0;
 }