Merge branch 'busybox' into merge

6 files changed, 61 insertions, 21 deletions

diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c
index 341c30102..edf734614 100644
--- a/libbb/find_mount_point.c
+++ b/libbb/find_mount_point.c
@@ -70,11 +70,22 @@ struct mntent* FAST_FUNC find_mount_point(const char *name, int subdir_too)
                         continue;
 
                 /* Is device's dev_t == name's dev_t? */
-                if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == devno_of_name)
+                if (mountEntry->mnt_fsname[0] == '/'
+                /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+                 * avoid stat'ing "sysfs", "proc", "none" and such,
+                 * useless at best, can stat unrelated files at worst.
+                 */
+                 && stat(mountEntry->mnt_fsname, &s) == 0
+                 && s.st_rdev == devno_of_name
+                ) {
                         break;
+                }
                 /* Match the directory's mount point. */
-                if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == devno_of_name)
+                if (stat(mountEntry->mnt_dir, &s) == 0
+                 && s.st_dev == devno_of_name
+                ) {
                         break;
+                }
         }
         endmntent(mtab_fp);
 #else
diff --git a/libbb/full_write.c b/libbb/full_write.c
index 2b7983f4c..15766fc6c 100644
--- a/libbb/full_write.c
+++ b/libbb/full_write.c
@@ -11,7 +11,8 @@
 /*
  * Write all of the supplied buffer out to a file.
  * This does multiple writes as necessary.
- * Returns the amount written, or -1 on an error.
+ * Returns the amount written, or -1 if error was seen
+ * on the very first write.
  */
 ssize_t FAST_FUNC full_write(int fd, const void *buf, size_t len)
 {
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 191bc0598..9781b4a08 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -70,13 +70,20 @@
 #if ENABLE_UNICODE_SUPPORT
 # define BB_NUL ((wchar_t)0)
 # define CHAR_T wchar_t
-static bool BB_isspace(CHAR_T c) { return ((unsigned)c < 256 && isspace(c)); }
+static bool BB_isspace(CHAR_T c)
+{
+        return ((unsigned)c < 256 && isspace(c));
+}
 # if ENABLE_FEATURE_EDITING_VI
-static bool BB_isalnum_or_underscore(CHAR_T c) {
+static bool BB_isalnum_or_underscore(CHAR_T c)
+{
         return ((unsigned)c < 256 && isalnum(c)) || c == '_';
 }
 # endif
-static bool BB_ispunct(CHAR_T c) { return ((unsigned)c < 256 && ispunct(c)); }
+static bool BB_ispunct(CHAR_T c)
+{
+        return ((unsigned)c < 256 && ispunct(c));
+}
 # undef isspace
 # undef isalnum
 # undef ispunct
diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index e47ac7afe..1e67d6542 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -107,10 +107,9 @@ char* FAST_FUNC xmalloc_reads(int fd, size_t *maxsz_p)
 
 // Read (potentially big) files in one go. File size is estimated
 // by stat. Extra '\0' byte is appended.
-void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
+void* FAST_FUNC xmalloc_read_with_initial_buf(int fd, size_t *maxsz_p, char *buf, size_t total)
 {
-        char *buf;
-        size_t size, rd_size, total;
+        size_t size, rd_size;
         size_t to_read;
         struct stat st;
 
@@ -123,8 +122,6 @@ void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
         /* In order to make such files readable, we add small const */
         size = (st.st_size | 0x3ff) + 1;
 
-        total = 0;
-        buf = NULL;
         while (1) {
                 if (to_read < size)
                         size = to_read;
@@ -153,6 +150,11 @@ void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
         return buf;
 }
 
+void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
+{
+        return xmalloc_read_with_initial_buf(fd, maxsz_p, NULL, 0);
+}
+
 #ifdef USING_LSEEK_TO_GET_SIZE
 /* Alternatively, file size can be obtained by lseek to the end.
  * The code is slightly bigger. Retained in case fstat approach
diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index 22c30357b..6d3459905 100644
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -12,7 +12,7 @@
 #endif
 
 #if ENABLE_FEATURE_SYSLOG
-smallint syslog_level = LOG_ERR;
+static smallint syslog_level = LOG_ERR;
 #endif
 smallint logmode = LOGMODE_STDIO;
 const char *msg_eol = "\n";
@@ -154,7 +154,7 @@ void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
         }
 # if ENABLE_FEATURE_SYSLOG
         if (logmode & LOGMODE_SYSLOG) {
-                syslog(LOG_ERR, "%s", msgc);
+                syslog(syslog_level, "%s", msgc);
         }
 # endif
         free(msgc);
@@ -180,3 +180,21 @@ void FAST_FUNC bb_error_msg(const char *s, ...)
         bb_verror_msg(s, p, NULL);
         va_end(p);
 }
+
+#if ENABLE_FEATURE_SYSLOG_INFO
+void FAST_FUNC bb_vinfo_msg(const char *s, va_list p)
+{
+        syslog_level = LOG_INFO;
+        bb_verror_msg(s, p, NULL);
+        syslog_level = LOG_ERR;
+}
+
+void FAST_FUNC bb_info_msg(const char *s, ...)
+{
+        va_list p;
+
+        va_start(p, s);
+        bb_vinfo_msg(s, p);
+        va_end(p);
+}
+#endif
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 2d497d754..26e1776a4 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -268,12 +268,6 @@ void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
         if (flags & DAEMON_CHDIR_ROOT)
                 xchdir("/");
 
-        if (flags & DAEMON_DEVNULL_STDIO) {
-                close(0);
-                close(1);
-                close(2);
-        }
-
         fd = open(bb_dev_null, O_RDWR);
         if (fd < 0) {
                 /* NB: we can be called as bb_sanitize_stdio() from init
@@ -283,8 +277,15 @@ void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
                 fd = xopen("/", O_RDONLY); /* don't believe this can fail */
         }
 
-        while ((unsigned)fd < 2)
-                fd = dup(fd); /* have 0,1,2 open at least to /dev/null */
+        if (flags & DAEMON_DEVNULL_STDIO) {
+                xdup2(fd, 0);
+                xdup2(fd, 1);
+                xdup2(fd, 2);
+        } else {
+                /* have 0,1,2 open at least to /dev/null */
+                while ((unsigned)fd < 2)
+                        fd = dup(fd);
+        }
 
         if (!(flags & DAEMON_ONLY_SANITIZE)) {