Some more patchelttes from Larry Doolittle.

[oweals/busybox.git] / hostname.c

diff --git a/hostname.c b/hostname.c
index 8ea8fe10787789247a13bd0f354de3834ce669bd..75e4d2e574e9cc635dca8112f745e33badf1af05 100644 (file)
--- a/hostname.c
+++ b/hostname.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.25 2001/03/09 14:36:42 andersen Exp $
+ * $Id: hostname.c,v 1.28 2001/05/16 15:40:48 kraai Exp $
  * Mini hostname implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -32,7 +32,7 @@
 #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];
@@ -112,19 +112,15 @@ int hostname_main(int argc, char **argv)
                        if (!s)
                                s = buf;
                        *s = 0;
-                       printf("%s\n", buf);
+                       puts(buf);
                } else if (opt_domain) {
                        s = strchr(buf, '.');
-                       printf("%s\n", (s ? s + 1 : ""));
+                       puts(s ? s + 1 : "");
                } else if (opt_ip) {
-                       h = gethostbyname(buf);
-                       if (!h) {
-                               printf("Host not found\n");
-                               exit(1);
-                       }
-                       printf("%s\n", inet_ntoa(*(struct in_addr *) (h->h_addr)));
+                       h = xgethostbyname(buf);
+                       puts(inet_ntoa(*(struct in_addr *) (h->h_addr)));
                } else {
-                       printf("%s\n", buf);
+                       puts(buf);
                }
        }
        return(0);