Fix the pwd and group functions. The bb_ stuff was a leftover from

[oweals/busybox.git] / hostname.c

diff --git a/hostname.c b/hostname.c
index 60f66c0736f75e041f07f582b2f44685362b5bc4..a789fa0f15d9a787691ae286db52f38bf3b3e63b 100644 (file)
--- a/hostname.c
+++ b/hostname.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.11 2000/07/14 01:51:25 kraai Exp $
+ * $Id: hostname.c,v 1.21 2001/01/27 08:24:37 andersen Exp $
  * Mini hostname implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -23,28 +23,14 @@
  * 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 <string.h>
 #include <stdio.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"
-
-       "\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)
 {
        FILE *f;
@@ -55,25 +41,18 @@ void do_sethostname(char *s, int isfile)
        if (!isfile) {
                if (sethostname(s, strlen(s)) < 0) {
                        if (errno == EPERM)
-                               errorMsg("you must be root to change the hostname\n");
+                               error_msg_and_die("you must be root to change the hostname\n");
                        else
-                               perror("sethostname");
-                       exit(1);
+                               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 = 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_msg_and_die("sethostname");
        }
 }
 
@@ -108,6 +87,12 @@ int hostname_main(int argc, char **argv)
                                }
                                filename = *(++argv);
                                break;
+                       case '-':
+                               if (strcmp(++(*argv), "file") || --argc ==0 ) {
+                                       usage(hostname_usage);
+                               }
+                               filename = *(++argv);
+                               break;
                        default:
                                usage(hostname_usage);
                        }