httpd: reduce ifdef forest. comment out redundant PATH setting

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

diff --git a/networking/nameif.c b/networking/nameif.c
index 3fa257263a8b2a254266be49a9a3232048607ff4..385e7fb718e02d46a16b1c56d143639bd09e05c3 100644 (file)
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -65,8 +65,8 @@ int nameif_main(int argc, char **argv)
        int if_index = 1;
        mactable_t *ch;
 
-       if (1 & bb_getopt_ulflags(argc, argv, "sc:", &fname)) {
-               openlog(bb_applet_name, 0, LOG_LOCAL0);
+       if (1 & getopt32(argc, argv, "sc:", &fname)) {
+               openlog(applet_name, 0, LOG_LOCAL0);
                logmode = LOGMODE_SYSLOG;
        }
 
@@ -91,7 +91,7 @@ int nameif_main(int argc, char **argv)
        } else {
                ifh = xfopen(fname, "r");
 
-               while ((line = bb_get_line_from_file(ifh)) != NULL) {
+               while ((line = xmalloc_fgets(ifh)) != NULL) {
                        char *line_ptr;
                        size_t name_length;