X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=pdm%2Fsshsock.py;h=2a1882a931bd704d81696045e42256ffdc364ac0;hb=refs%2Fheads%2Fmaster;hp=6efaba9b822ba3371ca97ed2273797197584e7b5;hpb=98ecc02e068d7108325210c9fd9f510ec7bae66c;p=pdm.git

diff --git a/pdm/sshsock.py b/pdm/sshsock.py
index 6efaba9..c0ac300 100644
--- a/pdm/sshsock.py
+++ b/pdm/sshsock.py
@@ -11,6 +11,7 @@ class sshsocket(object):
         args += [host]
         args += ["python3", "-m", "pdm.sshsock", path]
         self.proc = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, close_fds=True)
+        self.inbuf = bytearray()
         fcntl.fcntl(self.proc.stdout, fcntl.F_SETFL, fcntl.fcntl(self.proc.stdout, fcntl.F_GETFL) | os.O_NONBLOCK)
         head = self.recv(5)
         if head != b"SSOCK":
@@ -46,12 +47,22 @@ class sshsocket(object):
 
     def send(self, data, flags = 0):
         self.proc.stdin.write(data)
+        self.proc.stdin.flush()
         return len(data)
 
     def recv(self, buflen, flags = 0):
-        if (flags & socket.MSG_DONTWAIT) == 0:
-            select.select([self.proc.stdout], [], [])
-        return self.proc.stdout.read(buflen)
+        while len(self.inbuf) == 0:
+            try:
+                rv = os.read(self.proc.stdout.fileno(), max(4096, buflen))
+            except BlockingIOError:
+                if flags & socket.MSG_DONTWAIT:
+                    raise
+                select.select([self.proc.stdout], [], [])
+            else:
+                self.inbuf.extend(rv)
+        rv = bytes(self.inbuf[:buflen])
+        self.inbuf[:buflen] = b""
+        return rv
 
     def fileno(self):
         return self.proc.stdout.fileno()
@@ -67,8 +78,10 @@ def cli():
             sk.connect(sys.argv[1])
         except socket.error as err:
             sys.stdout.write("SSOCK-connect: %s\n" % err)
+            sys.stdout.flush()
             return
         sys.stdout.write("SSOCK+\n")
+        sys.stdout.flush()
         buf1 = b""
         buf2 = b""
         while True: