diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2010-09-27 16:10:07 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2010-09-27 16:52:28 +0200 |
| commit | c6be45c89346da80d557cdb01756e6e1975ad1ff (patch) | |
| tree | 6099b48254e5a8e40c8372ee19f2d65020658182 | |
| parent | 17218a83c920e38160655d03124e51b4ae40af24 (diff) | |
| download | gvfs-c6be45c89346da80d557cdb01756e6e1975ad1ff.tar.gz | |
sftp: Use poll() to cope with openssh-5.6 changes
Patch by Otto Allmendinger
See bug 629184 for details.
| -rw-r--r-- | daemon/gvfsbackendsftp.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c index 76ce64b0..9fecf6a4 100644 --- a/daemon/gvfsbackendsftp.c +++ b/daemon/gvfsbackendsftp.c @@ -24,6 +24,7 @@ #include <config.h> #include <stdlib.h> +#include <sys/poll.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> @@ -837,10 +838,9 @@ handle_login (GVfsBackend *backend, GVfsBackendSftp *op_backend = G_VFS_BACKEND_SFTP (backend); GInputStream *prompt_stream; GOutputStream *reply_stream; - fd_set ifds; - struct timeval tv; int ret; int prompt_fd; + struct pollfd fds[2]; char buffer[1024]; gsize len; gboolean aborted = FALSE; @@ -864,14 +864,12 @@ handle_login (GVfsBackend *backend, ret_val = TRUE; while (1) { - FD_ZERO (&ifds); - FD_SET (stdout_fd, &ifds); - FD_SET (prompt_fd, &ifds); + fds[0].fd = stdout_fd; + fds[0].events = POLLIN; + fds[1].fd = prompt_fd; + fds[1].events = POLLIN; - tv.tv_sec = SFTP_READ_TIMEOUT; - tv.tv_usec = 0; - - ret = select (MAX (stdout_fd, prompt_fd)+1, &ifds, NULL, NULL, &tv); + ret = poll(fds, 2, SFTP_READ_TIMEOUT); if (ret <= 0) { @@ -882,11 +880,11 @@ handle_login (GVfsBackend *backend, break; } - if (FD_ISSET (stdout_fd, &ifds)) + if (fds[0].revents) break; /* Got reply to initial INIT request */ - g_assert (FD_ISSET (prompt_fd, &ifds)); - + if (!(fds[1].revents & POLLIN)) + continue; len = g_input_stream_read (prompt_stream, buffer, sizeof (buffer) - 1, |