Skip to content

Commit 912dcd1

Browse files
committed
bump(main/zsh): 5.9.1
1 parent af57086 commit 912dcd1

8 files changed

Lines changed: 47 additions & 751 deletions

File tree

packages/zsh/Src-exec.c.patch

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
diff -u -r ../zsh-5.6/Src/exec.c ./Src/exec.c
2-
--- ../zsh-5.6/Src/exec.c 2018-09-03 14:58:01.000000000 +0000
3-
+++ ./Src/exec.c 2018-09-04 21:31:29.499488209 +0000
4-
@@ -553,7 +553,7 @@
5-
if (t0 == ct) {
6-
argv[-1] = "sh";
1+
diff --git a/Src/exec.c b/Src/exec.c
2+
index 8cdd86a..08115be 100644
3+
--- a/Src/exec.c
4+
+++ b/Src/exec.c
5+
@@ -585,7 +585,7 @@ zexecve(char *pth, char **argv, char **newenvp)
6+
}
7+
*--args = "sh";
78
winch_unblock();
8-
- execve("/bin/sh", argv - 1, newenvp);
9-
+ execve("@TERMUX_PREFIX@/bin/sh", argv - 1, newenvp);
9+
- execve("/bin/sh", args, newenvp);
10+
+ execve("@TERMUX_PREFIX@/bin/sh", args, newenvp);
1011
}
1112
}
1213
} else

packages/zsh/Src-init.c.patch

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/Src/init.c b/Src/init.c
2+
index a8ceec1..ccc3806 100644
3+
--- a/Src/init.c
4+
+++ b/Src/init.c
5+
@@ -716,7 +716,7 @@ mod_export void
6+
init_shout(void)
7+
{
8+
static char shoutbuf[BUFSIZ];
9+
-#if defined(TIOCSETD) && defined(NTTYDISC)
10+
+#if defined(TIOCSETD) && defined(NTTYDISC) && !defined(__ANDROID__)
11+
int ldisc;
12+
#endif
13+
14+
@@ -727,7 +727,7 @@ init_shout(void)
15+
return;
16+
}
17+
18+
-#if defined(TIOCSETD) && defined(NTTYDISC)
19+
+#if defined(TIOCSETD) && defined(NTTYDISC) && !defined(__ANDROID__)
20+
ldisc = NTTYDISC;
21+
ioctl(SHTTY, TIOCSETD, (char *)&ldisc);
22+
#endif

0 commit comments

Comments
 (0)