Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/xfuncs.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/xfuncs.c (modified) (4 diffs)

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

@@ -26 +26 @@
 
 /* Turn on nonblocking I/O on a fd */
-void FAST_FUNC ndelay_on(int fd)
+int FAST_FUNC ndelay_on(int fd)
 {
     int flags = fcntl(fd, F_GETFL);
     if (flags & O_NONBLOCK)
-        return;
+        return flags;
     fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-}
-
-void FAST_FUNC ndelay_off(int fd)
+    return flags;
+}
+
+int FAST_FUNC ndelay_off(int fd)
 {
     int flags = fcntl(fd, F_GETFL);
     if (!(flags & O_NONBLOCK))
-        return;
+        return flags;
     fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
+    return flags;
 }
 
@@ -206 +208 @@
 
         // If we can't, it's smaller.
-
         } else {
             if (bottom == top) {
@@ -270 +271 @@
     return err;
 }
+int FAST_FUNC get_terminal_width(int fd)
+{
+    unsigned width;
+    get_terminal_width_height(fd, &width, NULL);
+    return width;
+}
 
 int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp)
@@ -309 +316 @@
     return 0;
 }
+
+// Useful when we do know that pid is valid, and we just want to wait
+// for it to exit. Not existing pid is fatal. waitpid() status is not returned.
+int FAST_FUNC wait_for_exitstatus(pid_t pid)
+{
+    int exit_status, n;
+
+    n = safe_waitpid(pid, &exit_status, 0);
+    if (n < 0)
+        bb_perror_msg_and_die("waitpid");
+    return exit_status;
+}