Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/hostname.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/hostname.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/networking/hostname.c

@@ -5 +5 @@
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
  *
- * adjusted by Erik Andersen <andersen@codepoet.org> to remove
+ * Adjusted by Erik Andersen <andersen@codepoet.org> to remove
  * use of long options and GNU getopt.  Improved the usage info.
  *
- * 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.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 #include "libbb.h"
 
 static void do_sethostname(char *s, int isfile)
 {
-    FILE *f;
-
-    if (!s)
-        return;
-    if (!isfile) {
-        if (sethostname(s, strlen(s)) < 0) {
-            if (errno == EPERM)
-                bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-            else
-                bb_perror_msg_and_die("sethostname");
-        }
-    } else {
-        f = xfopen(s, "r");
-#define strbuf bb_common_bufsiz1
-        while (fgets(strbuf, sizeof(strbuf), f) != NULL) {
-            if (strbuf[0] == '#') {
-                continue;
-            }
-            chomp(strbuf);
-            do_sethostname(strbuf, 0);
+//  if (!s)
+//      return;
+    if (isfile) {
+        parser_t *parser = config_open2(s, xfopen_for_read);
+        while (config_read(parser, &s, 1, 1, "# \t", PARSE_NORMAL & ~PARSE_GREEDY)) {
+            do_sethostname(s, 0);
         }
         if (ENABLE_FEATURE_CLEAN_UP)
-            fclose(f);
+            config_close(parser);
+    } else if (sethostname(s, strlen(s))) {
+//      if (errno == EPERM)
+//          bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+        bb_perror_msg_and_die("sethostname");
     }
 }
 
-int hostname_main(int argc, char **argv);
-int hostname_main(int argc, char **argv)
+/* Manpage circa 2009:
+ *
+ * hostname [-v] [-a] [--alias] [-d] [--domain] [-f] [--fqdn] [--long]
+ *      [-i] [--ip-address] [-s] [--short] [-y] [--yp] [--nis]
+ *
+ * hostname [-v] [-F filename] [--file filename] / [hostname]
+ *
+ * domainname [-v] [-F filename] [--file filename]  / [name]
+ *  { bbox: not supported }
+ *
+ * nodename [-v] [-F filename] [--file filename] / [name]
+ *  { bbox: not supported }
+ *
+ * dnsdomainname [-v]
+ *  { bbox: supported: Linux kernel build needs this }
+ * nisdomainname [-v]
+ *  { bbox: not supported }
+ * ypdomainname [-v]
+ *  { bbox: not supported }
+ *
+ * -a, --alias
+ *  Display the alias name of the host (if used).
+ *  { bbox: not supported }
+ * -d, --domain
+ *  Display the name of the DNS domain. Don't use the command
+ *  domainname to get the DNS domain name because it will show the
+ *  NIS domain name and not the DNS domain name. Use dnsdomainname
+ *  instead.
+ * -f, --fqdn, --long
+ *  Display the FQDN (Fully Qualified Domain Name). A FQDN consists
+ *  of a short host name and the DNS domain name. Unless you are
+ *  using bind or NIS for host lookups you can change the FQDN and
+ *  the DNS domain name (which is part of the FQDN) in the
+ *  /etc/hosts file.
+ * -i, --ip-address
+ *  Display the IP address(es) of the host.
+ * -s, --short
+ *  Display the short host name. This is the host name cut at the
+ *  first dot.
+ * -v, --verbose
+ *  Be verbose and tell what's going on.
+ *  { bbox: supported but ignored }
+ * -y, --yp, --nis
+ *  Display the NIS domain name. If a parameter is given (or --file
+ *  name ) then root can also set a new NIS domain.
+ *  { bbox: not supported }
+ * -F, --file filename
+ *  Read the host name from the specified file. Comments (lines
+ *  starting with a `#') are ignored.
+ */
+int hostname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int hostname_main(int argc UNUSED_PARAM, char **argv)
 {
     enum {
@@ -55 +92 @@
     };
 
-    char buf[256];
+    unsigned opts;
+    char *buf;
     char *hostname_str;
 
-    if (argc < 1)
-        bb_show_usage();
+#if ENABLE_LONG_OPTS
+    applet_long_options =
+        "domain\0"     No_argument "d"
+        "fqdn\0"       No_argument "f"
+    //Enable if seen in active use in some distro:
+    //  "long\0"       No_argument "f"
+    //  "ip-address\0" No_argument "i"
+    //  "short\0"      No_argument "s"
+    //  "verbose\0"    No_argument "v"
+        "file\0"       No_argument "F"
+        ;
 
-    getopt32(argv, "dfisF:", &hostname_str);
+#endif
+    /* dnsdomainname from net-tools 1.60, hostname 1.100 (2001-04-14),
+     * supports hostname's options too (not just -v as manpage says) */
+    opts = getopt32(argv, "dfisF:v", &hostname_str);
+    argv += optind;
+    buf = safe_gethostname();
+    if (applet_name[0] == 'd') /* dnsdomainname? */
+        opts = OPT_d;
 
-    /* Output in desired format */
-    if (option_mask32 & OPT_dfis) {
+    if (opts & OPT_dfis) {
+        /* Cases when we need full hostname (or its part) */
         struct hostent *hp;
         char *p;
-        gethostname(buf, sizeof(buf));
+
         hp = xgethostbyname(buf);
-        p = strchr(hp->h_name, '.');
-        if (option_mask32 & OPT_f) {
+        p = strchrnul(hp->h_name, '.');
+        if (opts & OPT_f) {
             puts(hp->h_name);
-        } else if (option_mask32 & OPT_s) {
-            if (p != NULL) {
-                *p = '\0';
+        } else if (opts & OPT_s) {
+            *p = '\0';
+            puts(hp->h_name);
+        } else if (opts & OPT_d) {
+            if (*p)
+                puts(p + 1);
+        } else /*if (opts & OPT_i)*/ {
+            if (hp->h_length == sizeof(struct in_addr)) {
+                struct in_addr **h_addr_list = (struct in_addr **)hp->h_addr_list;
+                while (*h_addr_list) {
+                    printf("%s ", inet_ntoa(**h_addr_list));
+                    h_addr_list++;
+                }
+                bb_putchar('\n');
             }
-            puts(hp->h_name);
-        } 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("");
         }
-    }
-    /* Set the hostname */
-    else if (option_mask32 & OPT_F) {
+    } else if (opts & OPT_F) {
+        /* Set the hostname */
         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, sizeof(buf));
+    } else if (argv[0]) {
+        /* Set the hostname */
+        do_sethostname(argv[0], 0);
+    } else {
+        /* Just print the current hostname */
         puts(buf);
     }
-    return 0;
+
+    if (ENABLE_FEATURE_CLEAN_UP)
+        free(buf);
+    return EXIT_SUCCESS;
 }