diff options
Diffstat (limited to 'devel/anjuta/files/patch-libanjuta_anjuta-launcher.c')
| -rw-r--r-- | devel/anjuta/files/patch-libanjuta_anjuta-launcher.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c index 73987d782cd5..1c7679ab2b95 100644 --- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c +++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c @@ -1,5 +1,5 @@ ---- libanjuta/anjuta-launcher.c.orig Mon Jun 11 13:22:08 2007 -+++ libanjuta/anjuta-launcher.c Sun Jul 8 03:39:07 2007 +--- libanjuta/anjuta-launcher.c.orig 2008-02-15 18:32:29.000000000 -0500 ++++ libanjuta/anjuta-launcher.c 2008-02-25 22:45:03.000000000 -0500 @@ -37,7 +37,7 @@ #include <signal.h> @@ -9,17 +9,17 @@ # include <pty.h> # else # include <libutil.h> -@@ -713,7 +713,8 @@ anjuta_launcher_scan_output (GIOChannel +@@ -749,7 +749,8 @@ anjuta_launcher_scan_output (GIOChannel GError *err = NULL; do { - g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + GIOStatus status; + status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); - if (n > 0 && !err) /* There is output */ + if (n > 0) /* There is output */ { gchar *utf8_chars; -@@ -733,6 +734,13 @@ anjuta_launcher_scan_output (GIOChannel +@@ -776,6 +777,13 @@ anjuta_launcher_scan_output (GIOChannel anjuta_launcher_synchronize (launcher); ret = FALSE; } @@ -33,17 +33,17 @@ /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -762,7 +770,8 @@ anjuta_launcher_scan_error (GIOChannel * +@@ -805,7 +813,8 @@ anjuta_launcher_scan_error (GIOChannel * GError *err = NULL; do { - g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + GIOStatus status; + status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); - if (n > 0 && !err) /* There is stderr output */ + if (n > 0) /* There is stderr output */ { gchar *utf8_chars; -@@ -782,6 +791,13 @@ anjuta_launcher_scan_error (GIOChannel * +@@ -833,6 +842,13 @@ anjuta_launcher_scan_error (GIOChannel * anjuta_launcher_synchronize (launcher); ret = FALSE; } @@ -57,24 +57,24 @@ /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -811,7 +827,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch +@@ -862,7 +878,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch GError *err = NULL; do { - g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + GIOStatus status; + status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); - if (n > 0 && !err) /* There is stderr output */ + if (n > 0) /* There is stderr output */ { gchar *utf8_chars; -@@ -833,6 +850,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch - else if (err && errno != EAGAIN && errno != EINTR) - { - g_warning (_("launcher.c: Error while reading child pty\n")); -+ ret = FALSE; -+ } -+ else if (status == G_IO_STATUS_EOF) -+ { +@@ -893,6 +910,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch + g_warning ("pty: %s", err->message); ret = FALSE; } ++ else if (status == G_IO_STATUS_EOF) ++ { ++ ret = FALSE; ++ } /* Read next chars if buffer was too small + * (the maximum length of one character is 6 bytes) */ + } while (!err && (n > FILE_BUFFER_SIZE - 7)); |