Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/read_printf.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/read_printf.c (modified) (4 diffs)

branches/3.3/mindi-busybox/libbb/read_printf.c

@@ -46 +46 @@
  * Thankfully, poll() doesn't care about O_NONBLOCK flag.
  */
-ssize_t FAST_FUNC nonblock_immune_read(int fd, void *buf, size_t count, int loop_on_EINTR)
+ssize_t FAST_FUNC nonblock_immune_read(int fd, void *buf, size_t count)
 {
     struct pollfd pfd[1];
@@ -52 +52 @@
 
     while (1) {
-        n = loop_on_EINTR ? safe_read(fd, buf, count) : read(fd, buf, count);
+        n = safe_read(fd, buf, count);
         if (n >= 0 || errno != EAGAIN)
             return n;
@@ -59 +59 @@
         pfd[0].events = POLLIN;
         /* note: safe_poll pulls in printf */
-        loop_on_EINTR ? safe_poll(pfd, 1, -1) : poll(pfd, 1, -1);
+        safe_poll(pfd, 1, -1);
     }
 }
@@ -82 +82 @@
             sz += 128;
         }
-        if (nonblock_immune_read(fd, p, 1, /*loop_on_EINTR:*/ 1) != 1) {
+        if (nonblock_immune_read(fd, p, 1) != 1) {
             /* EOF/error */
             if (p == buf) { /* we read nothing */