From c1e214367d3a8fb3f1d5f69c2fe6be13c71a3cbe Mon Sep 17 00:00:00 2001 From: Emanuele Giaquinta Date: Tue, 30 Dec 2008 01:20:09 +0000 Subject: [PATCH] Use net_receive in sig_exec_input_reader. git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4973 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-common/core/fe-exec.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c index 5740855d..32cd9f47 100644 --- a/src/fe-common/core/fe-exec.c +++ b/src/fe-common/core/fe-exec.c @@ -24,6 +24,7 @@ #include "commands.h" #include "pidwait.h" #include "line-split.h" +#include "network.h" #include "net-sendbuffer.h" #include "misc.h" #include "levels.h" @@ -350,16 +351,11 @@ static void sig_exec_input_reader(PROCESS_REC *rec) { char tmpbuf[512], *str; gsize recvlen; - int err, ret; + int ret; g_return_if_fail(rec != NULL); - recvlen = 0; - err = g_io_channel_read(rec->in, tmpbuf, - sizeof(tmpbuf), &recvlen); - if (err != 0 && err != G_IO_ERROR_AGAIN && errno != EINTR) - recvlen = -1; - + recvlen = net_receive(rec->in, tmpbuf, sizeof(tmpbuf)); do { ret = line_split(tmpbuf, recvlen, &str, &rec->databuf); if (ret == -1) {