Patch from Larry Doolittle (with minor touchups from me so everything compiles

[oweals/busybox.git] / hostname.c

diff --git a/hostname.c b/hostname.c
index 8cc334da00344b15519006743e6475a0cd968f4b..44d529c83fc287e2625fc658bdbe5b282d6b61fc 100644 (file)
--- a/hostname.c
+++ b/hostname.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.7 2000/02/08 19:58:47 erik Exp $
+ * $Id: hostname.c,v 1.15 2000/10/12 22:30:31 andersen Exp $
  * Mini hostname implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -23,25 +23,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <errno.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
 #include <stdio.h>
 
-static const char *hostname_usage =
-       "hostname [OPTION] {hostname | -F file}\n\n"
-       "Get 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"
-
-       "\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";
-
-
 void do_sethostname(char *s, int isfile)
 {
        FILE *f;
@@ -52,25 +40,20 @@ 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");
+                               errorMsg("you must be root to change the hostname\n");
                        else
                                perror("sethostname");
                        exit(1);
                }
        } else {
-               if ((f = fopen(s, "r")) == NULL) {
-                       perror(s);
+               f = xfopen(s, "r");
+               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);
-               } 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);
-                       }
                }
        }
 }
@@ -101,12 +84,17 @@ int hostname_main(int argc, char **argv)
                                opt_domain = 1;
                                break;
                        case 'F':
-                               filename = optarg;
                                if (--argc == 0) {
                                        usage(hostname_usage);
                                }
                                filename = *(++argv);
                                break;
+                       case '-':
+                               if (strcmp(++(*argv), "file") || --argc ==0 ) {
+                                       usage(hostname_usage);
+                               }
+                               filename = *(++argv);
+                               break;
                        default:
                                usage(hostname_usage);
                        }
@@ -141,5 +129,5 @@ int hostname_main(int argc, char **argv)
                        printf("%s\n", buf);
                }
        }
-       exit(0);
+       return(0);
 }