X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=hostname.c;h=a6e001d54459dcfb502d680c25c3818a35b1d1f8;hb=e5f39576650933770153e82c63a46f27fcd72b0e;hp=c64d1602b987abc9ab94c5bf0811baf857333369;hpb=a9819b290848e0a760f3805d5937fa050235d707;p=oweals%2Fbusybox.git

diff --git a/hostname.c b/hostname.c
index c64d1602b..a6e001d54 100644
--- a/hostname.c
+++ b/hostname.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.17 2000/12/22 01:48:07 kraai Exp $
+ * $Id: hostname.c,v 1.26 2001/03/09 21:24:12 andersen Exp $
  * Mini hostname implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -28,9 +28,11 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
+#include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
-void do_sethostname(char *s, int isfile)
+static void do_sethostname(char *s, int isfile)
 {
 	FILE *f;
 	char buf[255];
@@ -40,7 +42,7 @@ void do_sethostname(char *s, int isfile)
 	if (!isfile) {
 		if (sethostname(s, strlen(s)) < 0) {
 			if (errno == EPERM)
-				error_msg_and_die("you must be root to change the hostname\n");
+				error_msg_and_die("you must be root to change the hostname");
 			else
 				perror_msg_and_die("sethostname");
 		}
@@ -48,8 +50,7 @@ void do_sethostname(char *s, int isfile)
 		f = xfopen(s, "r");
 		fgets(buf, 255, f);
 		fclose(f);
-		if (buf[strlen(buf) - 1] == '\n')
-			buf[strlen(buf) - 1] = 0;
+		chomp(buf);
 		if (sethostname(buf, strlen(buf)) < 0)
 			perror_msg_and_die("sethostname");
 	}
@@ -66,7 +67,7 @@ int hostname_main(int argc, char **argv)
 	char *s = NULL;
 
 	if (argc < 1)
-		usage(hostname_usage);
+		show_usage();
 
 	while (--argc > 0 && **(++argv) == '-') {
 		while (*(++(*argv))) {
@@ -82,18 +83,18 @@ int hostname_main(int argc, char **argv)
 				break;
 			case 'F':
 				if (--argc == 0) {
-					usage(hostname_usage);
+					show_usage();
 				}
 				filename = *(++argv);
 				break;
 			case '-':
 				if (strcmp(++(*argv), "file") || --argc ==0 ) {
-					usage(hostname_usage);
+					show_usage();
 				}
 				filename = *(++argv);
 				break;
 			default:
-				usage(hostname_usage);
+				show_usage();
 			}
 			if (filename != NULL)
 				break;