- patch from Denis Vlasenko to add and use bb_xchdir()

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

diff --git a/networking/hostname.c b/networking/hostname.c
index f7c9fc426618181f4d84adde965b05f09366d530..8b9314c989487c660c52a208407bd42ae98532c5 100644 (file)
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -1,11 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.34 2002/11/10 22:07:48 bug1 Exp $
+ * $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>
  *
- * adjusted by Erik Andersen <andersee@debian.org> to remove
+ * adjusted by Erik Andersen <andersen@codepoet.org> to remove
  * use of long options and GNU getopt.  Improved the usage info.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -46,12 +46,12 @@ static void do_sethostname(char *s, int isfile)
        if (!isfile) {
                if (sethostname(s, strlen(s)) < 0) {
                        if (errno == EPERM)
-                               error_msg_and_die("you must be root to change the hostname");
+                               bb_error_msg_and_die("you must be root to change the hostname");
                        else
-                               perror_msg_and_die("sethostname");
+                               bb_perror_msg_and_die("sethostname");
                }
        } else {
-               f = xfopen(s, "r");
+               f = bb_xfopen(s, "r");
                while (fgets(buf, 255, f) != NULL) {
                        if (buf[0] =='#') {
                                continue;
@@ -75,10 +75,10 @@ int hostname_main(int argc, char **argv)
        char *p = NULL;
 
        if (argc < 1)
-               show_usage();
+               bb_show_usage();
 
-        while ((opt = getopt(argc, argv, "dfisF:")) > 0) {
-                switch (opt) {
+       while ((opt = getopt(argc, argv, "dfisF:")) > 0) {
+               switch (opt) {
                case 'd':
                case 'f':
                case 'i':
@@ -89,7 +89,7 @@ int hostname_main(int argc, char **argv)
                        filename = optarg;
                        break;
                default:
-                       show_usage();
+                       bb_show_usage();
                }
        }