Merge branch 'origin/master' (early part)

Conflicts:
	include/libbb.h
	libbb/messages.c

4 files changed, 4 insertions, 31 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 4fbf486b5..f30fa4818 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -57,7 +57,6 @@ lib-y += md5.o
 #lib-y += md5prime.o
 lib-y += messages.o
 lib-y += mode_string.o
-lib-y += mtab_file.o
 lib-y += obscure.o
 lib-y += parse_mode.o
 lib-y += parse_config.o
diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index b47259089..e031ddf9b 100644
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -23,7 +23,7 @@ int FAST_FUNC INET_resolve(const char *name, struct sockaddr_in *s_in, int hostf
         s_in->sin_port = 0;
 
         /* Default is special, meaning 0.0.0.0. */
-        if (!strcmp(name, bb_str_default)) {
+        if (strcmp(name, "default") == 0) {
                 s_in->sin_addr.s_addr = INADDR_ANY;
                 return 1;
         }
@@ -109,7 +109,7 @@ char* FAST_FUNC INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t ne
         if (ad == INADDR_ANY) {
                 if ((numeric & 0x0FFF) == 0) {
                         if (numeric & 0x8000)
-                                return xstrdup(bb_str_default);
+                                return xstrdup("default");
                         return xstrdup("*");
                 }
         }
@@ -205,7 +205,7 @@ char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
         }
         if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
                 if (numeric & 0x8000)
-                        return xstrdup(bb_str_default);
+                        return xstrdup("default");
                 return xstrdup("*");
         }
 
diff --git a/libbb/messages.c b/libbb/messages.c
index 0c13449c0..3c3ec3519 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -24,8 +24,6 @@ const char bb_banner[] ALIGN1 = BANNER;
 
 const char bb_msg_memory_exhausted[] ALIGN1 = "memory exhausted";
 const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'";
-const char bb_msg_write_error[] ALIGN1 = "write error";
-const char bb_msg_read_error[] ALIGN1 = "read error";
 const char bb_msg_unknown[] ALIGN1 = "(unknown)";
 const char bb_msg_can_not_create_raw_socket[] ALIGN1 = "can't create raw socket";
 const char bb_msg_perm_denied_are_you_root[] ALIGN1 = "permission denied (are you root?)";
@@ -35,18 +33,9 @@ const char bb_msg_invalid_arg[] ALIGN1 = "invalid argument '%s' to '%s'";
 const char bb_msg_standard_input[] ALIGN1 = "standard input";
 const char bb_msg_standard_output[] ALIGN1 = "standard output";
 
-const char bb_str_default[] ALIGN1 = "default";
 const char bb_hexdigits_upcase[] ALIGN1 = "0123456789ABCDEF";
 
-const char bb_path_passwd_file[] ALIGN1 = "/etc/passwd";
-const char bb_path_shadow_file[] ALIGN1 = "/etc/shadow";
-const char bb_path_group_file[] ALIGN1 = "/etc/group";
-const char bb_path_gshadow_file[] ALIGN1 = "/etc/gshadow";
-const char bb_path_motd_file[] ALIGN1 = "/etc/motd";
-const char bb_dev_null[] ALIGN1 = "/dev/null";
-#if ENABLE_PLATFORM_MINGW32
-/* bb_busybox_exec_path is redefined to get_busybox_exec_path() in libbb.h */
-#else
+#if !ENABLE_PLATFORM_MINGW32
 const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH;
 #endif
 const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL;
diff --git a/libbb/mtab_file.c b/libbb/mtab_file.c
deleted file mode 100644
index add990ded..000000000
--- a/libbb/mtab_file.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
-
-#include "libbb.h"
-
-/* Busybox mount uses either /proc/mounts or /etc/mtab to
- * get the list of currently mounted filesystems */
-const char bb_path_mtab_file[] ALIGN1 =
-IF_FEATURE_MTAB_SUPPORT("/etc/mtab")IF_NOT_FEATURE_MTAB_SUPPORT("/proc/mounts");