Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/xfuncs.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/xfuncs.c (modified) (2 diffs)

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

@@ -26 +26 @@
 
 /* Turn on nonblocking I/O on a fd */
-int FAST_FUNC ndelay_on(int fd)
-{
-    return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
-}
-
-int FAST_FUNC ndelay_off(int fd)
-{
-    return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_NONBLOCK);
-}
-
-int FAST_FUNC close_on_exec_on(int fd)
-{
-    return fcntl(fd, F_SETFD, FD_CLOEXEC);
+void FAST_FUNC ndelay_on(int fd)
+{
+    int flags = fcntl(fd, F_GETFL);
+    if (flags & O_NONBLOCK)
+        return;
+    fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+}
+
+void FAST_FUNC ndelay_off(int fd)
+{
+    int flags = fcntl(fd, F_GETFL);
+    if (!(flags & O_NONBLOCK))
+        return;
+    fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
+}
+
+void FAST_FUNC close_on_exec_on(int fd)
+{
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
 }
 
@@ -235 +241 @@
         if (s) {
             value = atoi(s);
-            /* If LINES/COLUMNS are set, pretent that there is
+            /* If LINES/COLUMNS are set, pretend that there is
              * no error getting w/h, this prevents some ugly
              * cursor tricks by our callers */