blob: 5c4ba403ace33882466da0b486d1a56292c81f7e (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
--- src/mapping-protocol.c.orig Sun Aug 20 08:47:20 2006
+++ src/mapping-protocol.c Tue Aug 29 22:06:18 2006
@@ -26,6 +26,8 @@
#include "config.h"
+#include <sys/types.h>
+#include <sys/time.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
@@ -36,6 +38,8 @@
G_LOCK_DEFINE_STATIC (channel_lock);
+static gboolean at_eof = FALSE;
+
#define MINIMUM_MESSAGE_SIZE 16
struct MappingProtocolChannel {
@@ -1189,6 +1193,9 @@ mapping_protocol_channel_fill_read_buffe
status = g_io_channel_read_chars (channel->iochannel, data, count, &length, NULL);
+ if (status == G_IO_STATUS_EOF) {
+ at_eof = TRUE;
+ }
if (status != G_IO_STATUS_NORMAL) {
return;
}
@@ -1340,7 +1347,7 @@ handle_read (GIOChannel *sou
mapping_protocol_channel_do_iteration (channel);
}
- if (condition & G_IO_HUP) {
+ if (condition & G_IO_HUP || at_eof) {
channel->read_watch_id = 0;
res = FALSE;
/* send a NULL message to signal error */
|
