- deraadt@cvs.openbsd.org 2001/03/06 00:33:04

     [authfd.c cli.c ssh-agent.c]
     EINTR/EAGAIN handling is required in more cases

1 files changed, 18 insertions, 6 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index a558ecef7..5a774d570 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ssh-agent.c,v 1.51 2001/03/02 18:54:31 deraadt Exp $  */
+/*      $OpenBSD: ssh-agent.c,v 1.52 2001/03/06 00:33:04 deraadt Exp $  */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.51 2001/03/02 18:54:31 deraadt Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.52 2001/03/06 00:33:04 deraadt Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -635,9 +635,15 @@ after_select(fd_set *readset, fd_set *writeset)
                 case AUTH_CONNECTION:
                         if (buffer_len(&sockets[i].output) > 0 &&
                             FD_ISSET(sockets[i].fd, writeset)) {
-                                len = write(sockets[i].fd,
-                                    buffer_ptr(&sockets[i].output),
-                                    buffer_len(&sockets[i].output));
+                                do {
+                                        len = write(sockets[i].fd,
+                                            buffer_ptr(&sockets[i].output),
+                                            buffer_len(&sockets[i].output));
+                                        if (len == -1 && (errno == EAGAIN ||
+                                            errno == EINTR))
+                                                continue;
+                                        break;
+                                } while (1);
                                 if (len <= 0) {
                                         shutdown(sockets[i].fd, SHUT_RDWR);
                                         close(sockets[i].fd);
@@ -649,7 +655,13 @@ after_select(fd_set *readset, fd_set *writeset)
                                 buffer_consume(&sockets[i].output, len);
                         }
                         if (FD_ISSET(sockets[i].fd, readset)) {
-                                len = read(sockets[i].fd, buf, sizeof(buf));
+                                do {
+                                        len = read(sockets[i].fd, buf, sizeof(buf));
+                                        if (len == -1 && (errno == EAGAIN ||
+                                            errno == EINTR))
+                                                continue;
+                                        break;
+                                } while (1);
                                 if (len <= 0) {
                                         shutdown(sockets[i].fd, SHUT_RDWR);
                                         close(sockets[i].fd);