Merge branch 'busybox' into merge

8 files changed, 27 insertions, 21 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index f7971daf4..17ce463ea 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -319,7 +319,7 @@ void lbb_prepare(const char *applet
                 IF_FEATURE_INDIVIDUAL(, char **argv))
 {
 #ifdef __GLIBC__
-        (*(int **)&bb_errno) = __errno_location();
+        (*(int **)not_const_pp(&bb_errno)) = __errno_location();
         barrier();
 #endif
         applet_name = applet;
diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index ae5c26999..d41fd10f0 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -18,7 +18,7 @@
  * was seen to cause largish delays when user tries to ^C a file copy.
  * Let's use a saner size.
  * Note: needs to be >= max(CONFIG_FEATURE_COPYBUF_KB),
- * or else "copy to eof" code will use neddlesly short reads.
+ * or else "copy to eof" code will use needlesly short reads.
  */
 #define SENDFILE_BIGBUF (16*1024*1024)
 
@@ -60,10 +60,13 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
                 ssize_t rd;
 
                 if (sendfile_sz) {
-                        rd = sendfile(dst_fd, src_fd, NULL,
-                                size > sendfile_sz ? sendfile_sz : size);
-                        if (rd >= 0)
-                                goto read_ok;
+                        /* dst_fd == -1 is a fake, else... */
+                        if (dst_fd >= 0) {
+                                rd = sendfile(dst_fd, src_fd, NULL,
+                                        size > sendfile_sz ? sendfile_sz : size);
+                                if (rd >= 0)
+                                        goto read_ok;
+                        }
                         sendfile_sz = 0; /* do not try sendfile anymore */
                 }
 #if CONFIG_FEATURE_COPYBUF_KB > 4
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 9781b4a08..9bb3ea98b 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -203,7 +203,7 @@ extern struct lineedit_statics *const lineedit_ptr_to_statics;
 #define delbuf           (S.delbuf          )
 
 #define INIT_S() do { \
-        (*(struct lineedit_statics**)&lineedit_ptr_to_statics) = xzalloc(sizeof(S)); \
+        (*(struct lineedit_statics**)not_const_pp(&lineedit_ptr_to_statics)) = xzalloc(sizeof(S)); \
         barrier(); \
         cmdedit_termw = 80; \
         IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;) \
diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
index 87cf59b3d..dc40d9155 100644
--- a/libbb/missing_syscalls.c
+++ b/libbb/missing_syscalls.c
@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
         return syscall(__NR_getsid, pid);
 }
 
-int stime(const time_t *t)
-{
-        struct timeval tv;
-        tv.tv_sec = *t;
-        tv.tv_usec = 0;
-        return settimeofday(&tv, NULL);
-}
-
 int sethostname(const char *name, size_t len)
 {
         return syscall(__NR_sethostname, name, len);
diff --git a/libbb/read.c b/libbb/read.c
index 5906bc225..a342506a8 100644
--- a/libbb/read.c
+++ b/libbb/read.c
@@ -12,9 +12,17 @@ ssize_t FAST_FUNC safe_read(int fd, void *buf, size_t count)
 {
         ssize_t n;
 
-        do {
+        for (;;) {
                 n = read(fd, buf, count);
-        } while (n < 0 && errno == EINTR);
+                if (n >= 0 || errno != EINTR)
+                        break;
+                /* Some callers set errno=0, are upset when they see EINTR.
+                 * Returning EINTR is wrong since we retry read(),
+                 * the "error" was transient.
+                 */
+                errno = 0;
+                /* repeat the read() */
+        }
 
         return n;
 }
diff --git a/libbb/read_key.c b/libbb/read_key.c
index 951786869..03b7da656 100644
--- a/libbb/read_key.c
+++ b/libbb/read_key.c
@@ -259,7 +259,8 @@ int64_t FAST_FUNC read_key(int fd, char *buffer, int timeout)
 
                         buffer[-1] = 0;
                         /* Pack into "1 <row15bits> <col16bits>" 32-bit sequence */
-                        col |= (((-1 << 15) | row) << 16);
+                        row |= ((unsigned)(-1) << 15);
+                        col |= (row << 16);
                         /* Return it in high-order word */
                         return ((int64_t) col << 32) | (uint32_t)KEYCODE_CURSOR_POS;
                 }
diff --git a/libbb/replace.c b/libbb/replace.c
index a661d96e6..6183d3e6f 100644
--- a/libbb/replace.c
+++ b/libbb/replace.c
@@ -15,6 +15,10 @@ unsigned FAST_FUNC count_strstr(const char *str, const char *sub)
         size_t sub_len = strlen(sub);
         unsigned count = 0;
 
+        /* If sub is empty, avoid an infinite loop */
+        if (sub_len == 0)
+                return strlen(str) + 1;
+
         while ((str = strstr(str, sub)) != NULL) {
                 count++;
                 str += sub_len;
diff --git a/libbb/time.c b/libbb/time.c
index cab0ad602..e66a9cba8 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -253,11 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
 #define CLOCK_MONOTONIC 1
 #endif
 
-/* libc has incredibly messy way of doing this,
- * typically requiring -lrt. We just skip all this mess */
 static void get_mono(struct timespec *ts)
 {
-        if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
+        if (clock_gettime(CLOCK_MONOTONIC, ts))
                 bb_simple_error_msg_and_die("clock_gettime(MONOTONIC) failed");
 }
 unsigned long long FAST_FUNC monotonic_ns(void)