summaryrefslogtreecommitdiffstats
path: root/source/ap/ksh93/patches/ksh-20120801-lexfix.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/ap/ksh93/patches/ksh-20120801-lexfix.patch
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap/ksh93/patches/ksh-20120801-lexfix.patch')
-rw-r--r--source/ap/ksh93/patches/ksh-20120801-lexfix.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/source/ap/ksh93/patches/ksh-20120801-lexfix.patch b/source/ap/ksh93/patches/ksh-20120801-lexfix.patch
deleted file mode 100644
index 9150da80d..000000000
--- a/source/ap/ksh93/patches/ksh-20120801-lexfix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -up ksh-20120801/src/cmd/ksh93/edit/edit.c.trajfiks ksh-20120801/src/cmd/ksh93/edit/edit.c
---- ksh-20120801/src/cmd/ksh93/edit/edit.c.trajfiks 2012-08-02 00:18:19.000000000 +0200
-+++ ksh-20120801/src/cmd/ksh93/edit/edit.c 2014-02-06 12:12:11.570942651 +0100
-@@ -53,6 +53,7 @@
-
- static char CURSOR_UP[20] = { ESC, '[', 'A', 0 };
- static char KILL_LINE[20] = { ESC, '[', 'J', 0 };
-+static char *savelex;
-
-
-
-@@ -232,6 +233,8 @@ int tty_set(int fd, int action, struct t
- void tty_cooked(register int fd)
- {
- register Edit_t *ep = (Edit_t*)(shgd->ed_context);
-+ if(ep->sh->st.trap[SH_KEYTRAP] && savelex)
-+ memcpy(ep->sh->lex_context,savelex,ep->sh->lexsize);
- ep->e_keytrap = 0;
- if(ep->e_raw==0)
- return;
-@@ -783,6 +786,13 @@ void ed_setup(register Edit_t *ep, int f
- ep->e_lbuf[n] = *pp++;
- ep->e_default = 0;
- }
-+ if(ep->sh->st.trap[SH_KEYTRAP])
-+ {
-+ if(!savelex)
-+ savelex = (char*)malloc(shp->lexsize);
-+ if(savelex)
-+ memcpy(savelex, ep->sh->lex_context, ep->sh->lexsize);
-+ }
- }
-
- static void ed_putstring(register Edit_t *ep, const char *str)
-diff -up ksh-20120801/src/cmd/ksh93/include/defs.h.trajfiks ksh-20120801/src/cmd/ksh93/include/defs.h
---- ksh-20120801/src/cmd/ksh93/include/defs.h.trajfiks 2014-02-06 12:18:13.149091836 +0100
-+++ ksh-20120801/src/cmd/ksh93/include/defs.h 2014-02-06 12:18:13.175091784 +0100
-@@ -224,6 +224,7 @@ struct shared
- int xargexit; \
- int nenv; \
- mode_t mask; \
-+ int lexsize; \
- Env_t *env; \
- void *init_context; \
- void *mac_context; \
-diff -up ksh-20120801/src/cmd/ksh93/sh/lex.c.trajfiks ksh-20120801/src/cmd/ksh93/sh/lex.c
---- ksh-20120801/src/cmd/ksh93/sh/lex.c.trajfiks 2014-02-06 12:19:13.587950320 +0100
-+++ ksh-20120801/src/cmd/ksh93/sh/lex.c 2014-02-06 12:19:13.623950219 +0100
-@@ -268,6 +268,7 @@ Lex_t *sh_lexopen(Lex_t *lp, Shell_t *sp
- {
- lp = (Lex_t*)newof(0,Lex_t,1,0);
- lp->sh = sp;
-+ sp->lexsize = sizeof(Lex_t);
- }
- fcnotify(lex_advance,lp);
- lp->lex.intest = lp->lex.incase = lp->lex.skipword = lp->lexd.warn = 0;