You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.2 KiB
42 lines
1.2 KiB
From 7973d45a0e1716ddc6bfb6caf600f826f59a7932 Mon Sep 17 00:00:00 2001
|
|
From: Yousong Zhou <yszhou4tech@gmail.com>
|
|
Date: Tue, 28 Apr 2015 21:26:15 +0800
|
|
Subject: [PATCH 200/210] xl2tpd-control: check end-of-file when reading pipe
|
|
to avoid dead loop.
|
|
|
|
---
|
|
xl2tpd-control.c | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/xl2tpd-control.c b/xl2tpd-control.c
|
|
index feafe10..e5904d8 100644
|
|
--- a/xl2tpd-control.c
|
|
+++ b/xl2tpd-control.c
|
|
@@ -306,17 +306,20 @@ int read_result(int result_fd, char* buf, ssize_t size)
|
|
/*FIXME: there is a chance to hang up reading.
|
|
Should I create watching thread with timeout?
|
|
*/
|
|
- ssize_t readed;
|
|
+ ssize_t readed = 0;
|
|
+ ssize_t len;
|
|
+
|
|
do
|
|
{
|
|
- readed = read (result_fd, buf, size);
|
|
- if (readed < 0)
|
|
+ len = read (result_fd, buf + readed, size - readed);
|
|
+ if (len < 0)
|
|
{
|
|
print_error (ERROR_LEVEL,
|
|
"error: can't read command result: %s\n", strerror (errno));
|
|
break;
|
|
}
|
|
- } while (readed == 0);
|
|
+ readed += len;
|
|
+ } while (len > 0 && (size - readed) > 0);
|
|
buf[readed] = '\0';
|
|
|
|
/* scan result code */
|
|
--
|
|
1.7.10.4
|
|
|