X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/951e2f60a78510492d148146f2b821c814af0859..HEAD:/packages/gawk/io.c.patch

diff --git a/packages/gawk/io.c.patch b/packages/gawk/io.c.patch
index 51604a3d..7cf8b4a6 100644
--- a/packages/gawk/io.c.patch
+++ b/packages/gawk/io.c.patch
@@ -1,28 +1,55 @@
-diff -u -r ../gawk-4.1.4/io.c ./io.c
---- ../gawk-4.1.4/io.c	2016-08-24 15:31:55.000000000 -0400
-+++ ./io.c	2016-11-23 18:27:30.481573610 -0500
-@@ -1976,7 +1976,7 @@
+diff -u -r ../gawk-4.2.1/io.c ./io.c
+--- ../gawk-4.2.1/io.c	2018-02-19 17:55:00.000000000 +0000
++++ ./io.c	2018-02-27 11:12:19.067766916 +0000
+@@ -2025,7 +2025,7 @@
  
- 			signal(SIGPIPE, SIG_DFL);
+ 		set_sigpipe_to_default();
  
--			execl("/bin/sh", "sh", "-c", str, NULL);
-+			execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", str, NULL);
- 			_exit(errno == ENOENT ? 127 : 126);
+-		execl("/bin/sh", "sh", "-c", command, NULL);
++		execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", command, NULL);
+ 		_exit(errno == ENOENT ? 127 : 126);
+ 
+ 	case -1:
+@@ -2077,7 +2077,7 @@
+ 
+ 		signal(SIGPIPE, SIG_DFL);
+ 
+-		execl("/bin/sh", "sh", "-c", command, NULL);
++		execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", command, NULL);
+ 		_exit(errno == ENOENT ? 127 : 126);
+ 
+ 	case -1:
+@@ -2364,7 +2364,7 @@
  
- 		case -1:
-@@ -2152,7 +2152,7 @@
+ 	/* stderr does NOT get dup'ed onto child's stdout */
+ #ifdef __EMX__
+-	pid = spawnl(P_NOWAIT, "/bin/sh", "sh", "-c", str, NULL);
++	pid = spawnl(P_NOWAIT, "@TERMUX_PREFIX@/bin/sh", "sh", "-c", str, NULL);
+ #else  /* __MINGW32__ */
+ 	pid = spawnl(P_NOWAIT, getenv("ComSpec"), "cmd.exe", "/c",
+ 		     qcmd = quote_cmd(str), NULL);
+@@ -2422,7 +2422,7 @@
  			fatal(_("close of pipe failed (%s)"), strerror(errno));
  		/* stderr does NOT get dup'ed onto child's stdout */
- 		signal(SIGPIPE, SIG_DFL);
+ 		set_sigpipe_to_default();
 -		execl("/bin/sh", "sh", "-c", str, NULL);
 +		execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", str, NULL);
  		_exit(errno == ENOENT ? 127 : 126);
  	}
  #endif /* NOT __EMX__, NOT __MINGW32__ */
-@@ -2346,7 +2346,7 @@
+@@ -2634,7 +2634,7 @@
+ 	os_close_on_exec(save_stdout, cmd, "pipe", "from"); /* saved stdout of the parent process */
+ 
+ #ifdef __EMX__
+-	pid = spawnl(P_NOWAIT, "/bin/sh", "sh", "-c", cmd, NULL);
++	pid = spawnl(P_NOWAIT, "@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, NULL);
+ #else  /* __MINGW32__ */
+ 	pid = spawnl(P_NOWAIT, getenv("ComSpec"), "cmd.exe", "/c",
+ 		     qcmd = quote_cmd(cmd), NULL);
+@@ -2659,7 +2659,7 @@
  		if (close(p[0]) == -1 || close(p[1]) == -1)
  			fatal(_("close of pipe failed (%s)"), strerror(errno));
- 		signal(SIGPIPE, SIG_DFL);
+ 		set_sigpipe_to_default();
 -		execl("/bin/sh", "sh", "-c", cmd, NULL);
 +		execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, NULL);
  		_exit(errno == ENOENT ? 127 : 126);