Attachment 591269 Details for Bug 831259 – Don't block on ssh stderr (v2)

[patch] Don't block on ssh stderr (v2)

vinagre-3.3.4-dont-block-on-ssh-stderr.patch (text/plain), 1.55 KB, created by Fabrice Bellet on 2012-06-12 19:58:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabrice Bellet

Created: 2012-06-12 19:58:20 UTC

Size: 1.55 KB

patch

obsolete

>--- vinagre-3.4.2/vinagre/vinagre-ssh.c.ssh-stderr	2011-12-18 13:35:09.000000000 +0100
>+++ vinagre-3.4.2/vinagre/vinagre-ssh.c	2012-06-12 18:41:12.832836326 +0200
>@@ -667,15 +667,18 @@ get_hostname (const gchar *host)
> }
> 
> static gboolean
>-look_for_stderr_errors (GDataInputStream *error_stream, GError **error)
>+look_for_stderr_errors (GInputStream *error_stream, GError **error)
> {
>-  char *line;
>+  char line[128];
>+  gssize res;
> 
>   while (1)
>     {
>-      line = g_data_input_stream_read_line (error_stream, NULL, NULL, NULL);
>+      res = g_pollable_input_stream_read_nonblocking
>+                (G_POLLABLE_INPUT_STREAM (error_stream),
>+                  line, sizeof (line), NULL, error);
> 
>-      if (line == NULL)
>+      if (res <= 0)
>         {
>           return TRUE;
>         }
>@@ -716,7 +719,6 @@ look_for_stderr_errors (GDataInputStream
>           return FALSE;
>         }
>       
>-      g_free (line);
>     }
> 
>   return TRUE;
>@@ -787,18 +789,12 @@ vinagre_ssh_connect (GtkWindow *parent,
>     return FALSE;
> 
> #ifdef G_OS_WIN32
>-  u_long mode = 1;
>-  ioctlsocket (stderr_fd, FIONBIO, &mode);
>   is = g_win32_input_stream_new (stderr_fd, FALSE);
> #else /* !G_OS_WIN32 */
>-  fcntl (stderr_fd, F_SETFL, O_NONBLOCK | fcntl (stderr_fd, F_GETFL));
>   is = g_unix_input_stream_new (stderr_fd, FALSE);
> #endif /* G_OS_WIN32 */
>-  error_stream = g_data_input_stream_new (is);
>+  res = look_for_stderr_errors (is, error);
>   g_object_unref (is);
>-  
>-  res = look_for_stderr_errors (error_stream, error);
>-  g_object_unref (error_stream);
> 
>   if (!res)
>     return FALSE;

Actions: View | Diff

Attachments on bug 831259: 591219 | 591269