From c0a6432967c54d739cb0f01e87c834c3927f84f2 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Tue, 1 Oct 2024 22:39:06 +0200
Subject: [PATCH] Extract EINTR handling for Os.write()

Expose a function which retries automatically on EINTR, and throws an
IOException on other errors.
---
 .../java/com/genymobile/scrcpy/util/IO.java   | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/server/src/main/java/com/genymobile/scrcpy/util/IO.java b/server/src/main/java/com/genymobile/scrcpy/util/IO.java
index ab3fa59f..5c558c1b 100644
--- a/server/src/main/java/com/genymobile/scrcpy/util/IO.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/IO.java
@@ -17,24 +17,30 @@ public final class IO {
         // not instantiable
     }
 
+    private static int write(FileDescriptor fd, ByteBuffer from) throws IOException {
+        while (true) {
+            try {
+                return Os.write(fd, from);
+            } catch (ErrnoException e) {
+                if (e.errno != OsConstants.EINTR) {
+                    throw new IOException(e);
+                }
+            }
+        }
+    }
+
     public static void writeFully(FileDescriptor fd, ByteBuffer from) throws IOException {
         // ByteBuffer position is not updated as expected by Os.write() on old Android versions, so
         // count the remaining bytes manually.
         // See <https://github.com/Genymobile/scrcpy/issues/291>.
         int remaining = from.remaining();
         while (remaining > 0) {
-            try {
-                int w = Os.write(fd, from);
-                if (BuildConfig.DEBUG && w < 0) {
-                    // w should not be negative, since an exception is thrown on error
-                    throw new AssertionError("Os.write() returned a negative value (" + w + ")");
-                }
-                remaining -= w;
-            } catch (ErrnoException e) {
-                if (e.errno != OsConstants.EINTR) {
-                    throw new IOException(e);
-                }
+            int w = write(fd, from);
+            if (BuildConfig.DEBUG && w < 0) {
+                // w should not be negative, since an exception is thrown on error
+                throw new AssertionError("Os.write() returned a negative value (" + w + ")");
             }
+            remaining -= w;
         }
     }