mdev: fix a bug where we were eating argv[0] of helper

[oweals/busybox.git] / networking / hostname.c

diff --git a/networking/hostname.c b/networking/hostname.c
index 4fe28d7403f8096bd03633ce9ccb1a95aa56869b..93cbc961f895983227909ab57755eaaca52b631b 100644 (file)
--- 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>
@@ -13,37 +12,36 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 static void do_sethostname(char *s, int isfile)
 {
        FILE *f;
-       char buf[256];
 
        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");
-                       else
-                               bb_perror_msg_and_die("sethostname");
+                               bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+                       bb_perror_msg_and_die("sethostname");
                }
        } else {
                f = xfopen(s, "r");
-               while (fgets(buf, sizeof(buf), f) != NULL) {
-                       if (buf[0] =='#') {
+#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) MAIN_EXTERNALLY_VISIBLE;
 int hostname_main(int argc, char **argv)
 {
        enum {
@@ -51,52 +49,54 @@ int hostname_main(int argc, char **argv)
                OPT_f = 0x2,
                OPT_i = 0x4,
                OPT_s = 0x8,
+               OPT_F = 0x10,
                OPT_dfis = 0xf,
        };
 
-       char buf[256];
-       unsigned opt;
-       char *hostname_str = NULL;
+       char *buf;
+       char *hostname_str;
 
        if (argc < 1)
                bb_show_usage();
 
-       opt = getopt32(argc, argv, "dfisF:", &hostname_str);
+       getopt32(argv, "dfisF:", &hostname_str);
+       argv += optind;
+       buf = safe_gethostname();
 
        /* Output in desired format */
-       if (opt & OPT_dfis) {
+       if (option_mask32 & OPT_dfis) {
                struct hostent *hp;
                char *p;
-               gethostname(buf, sizeof(buf));
                hp = xgethostbyname(buf);
                p = strchr(hp->h_name, '.');
-               if (opt & OPT_f) {
+               if (option_mask32 & OPT_f) {
                        puts(hp->h_name);
-               } else if (opt & OPT_s) {
-                       if (p != NULL) {
-                               *p = 0;
-                       }
+               } else if (option_mask32 & OPT_s) {
+                       if (p)
+                               *p = '\0';
                        puts(hp->h_name);
-               } else if (opt & OPT_d) {
-                       if (p) puts(p + 1);
-               } else if (opt & OPT_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++)));
                        }
-                       puts("");
+                       bb_putchar('\n');
                }
        }
        /* Set the hostname */
-       else if (hostname_str != NULL) {
+       else if (option_mask32 & OPT_F) {
                do_sethostname(hostname_str, 1);
-       } else if (optind < argc) {
-               do_sethostname(argv[optind], 0);
+       } else if (argv[0]) {
+               do_sethostname(argv[0], 0);
        }
        /* Or if all else fails,
         * just print the current hostname */
        else {
-               gethostname(buf, sizeof(buf));
                puts(buf);
        }
+       if (ENABLE_FEATURE_CLEAN_UP)
+               free(buf);
        return 0;
 }