From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 19 Jun 2017 10:48:32 +0000 (+0200)
Subject: cgi-io: merge changes from luci2-io-helper
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=504a51fba618b9f7bf46693714bb672c49fc3323;p=project%2Fcgi-io.git

cgi-io: merge changes from luci2-io-helper

luci2-io-helper: bugfix buckup script read timeout

Reading files from stdin will block for ever. The uhttpd is killing the
backup process after script_timeout.

Switching read to non blocking mode and add a waitpid for the slave
process does not end in a script_timeout anymore.

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/Makefile b/Makefile
index 3032ca4..34c5359 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cgi-io
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_LICENSE:=GPL-2.0+
 
diff --git a/src/main.c b/src/main.c
index 69df2d6..019bdf1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -577,6 +577,7 @@ main_backup(int argc, char **argv)
 	pid_t pid;
 	time_t now;
 	int len;
+	int status;
 	int fds[2];
 	char buf[4096];
 	char datestr[16] = { 0 };
@@ -610,6 +611,7 @@ main_backup(int argc, char **argv)
 		return -1;
 
 	default:
+		fcntl(fds[0], F_SETFL, fcntl(fds[0], F_GETFL) | O_NONBLOCK);
 		now = time(NULL);
 		strftime(datestr, sizeof(datestr) - 1, "%Y-%m-%d", localtime(&now));
 
@@ -621,10 +623,15 @@ main_backup(int argc, char **argv)
 		printf("Content-Disposition: attachment; "
 		       "filename=\"backup-%s-%s.tar.gz\"\r\n\r\n", hostname, datestr);
 
-		while ((len = read(fds[0], buf, sizeof(buf))) > 0)
-			fwrite(buf, len, 1, stdout);
+		do {
+			waitpid(pid, &status, 0);
 
-		waitpid(pid, NULL, 0);
+			while ((len = read(fds[0], buf, sizeof(buf))) > 0) {
+				fwrite(buf, len, 1, stdout);
+				fflush(stdout);
+			}
+
+		} while (!WIFEXITED(status));
 
 		close(fds[0]);
 		close(fds[1]);