summaryrefslogtreecommitdiffstats
path: root/source/ap/ksh93/patches/ksh-20120801-trapcom.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-trapcom.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-trapcom.patch')
-rw-r--r--source/ap/ksh93/patches/ksh-20120801-trapcom.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/source/ap/ksh93/patches/ksh-20120801-trapcom.patch b/source/ap/ksh93/patches/ksh-20120801-trapcom.patch
deleted file mode 100644
index a900b5437..000000000
--- a/source/ap/ksh93/patches/ksh-20120801-trapcom.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -up ksh-20120801/src/cmd/ksh93/sh/subshell.c.orig ksh-20120801/src/cmd/ksh93/sh/subshell.c
---- ksh-20120801/src/cmd/ksh93/sh/subshell.c.orig 2014-08-23 20:20:24.676186573 -0300
-+++ ksh-20120801/src/cmd/ksh93/sh/subshell.c 2014-08-23 20:29:00.772151283 -0300
-@@ -481,12 +481,12 @@ Sfio_t *sh_subshell(Shell_t *shp,Shnode_
- {
- struct subshell sub_data;
- register struct subshell *sp = &sub_data;
-- int jmpval,nsig=0,duped=0;
-+ int jmpval,isig,nsig=0,duped=0;
- long savecurenv = shp->curenv;
- int savejobpgid = job.curpgid;
- int *saveexitval = job.exitval;
- int16_t subshell;
-- char *savsig;
-+ char **savsig;
- Sfio_t *iop=0;
- struct checkpt buff;
- struct sh_scoped savst;
-@@ -561,10 +561,13 @@ Sfio_t *sh_subshell(Shell_t *shp,Shnode_
- /* save trap table */
- shp->st.otrapcom = 0;
- shp->st.otrap = savst.trap;
-- if((nsig=shp->st.trapmax*sizeof(char*))>0 || shp->st.trapcom[0])
-+ if((nsig=shp->st.trapmax)>0 || shp->st.trapcom[0])
- {
-- nsig += sizeof(char*);
-- memcpy(savsig=malloc(nsig),(char*)&shp->st.trapcom[0],nsig);
-+ ++nsig;
-+ savsig = malloc(nsig * sizeof(char*));
-+ /* contents of shp->st.st.trapcom may change */
-+ for (isig = 0; isig < nsig; ++isig)
-+ savsig[isig] = shp->st.trapcom[isig] ? strdup(shp->st.trapcom[isig]) : NULL;
- /* this nonsense needed for $(trap) */
- shp->st.otrapcom = (char**)savsig;
- }
-@@ -729,7 +732,10 @@ Sfio_t *sh_subshell(Shell_t *shp,Shnode_
- shp->st.otrap = 0;
- if(nsig)
- {
-- memcpy((char*)&shp->st.trapcom[0],savsig,nsig);
-+ for (isig = 0; isig < nsig; ++isig)
-+ if (shp->st.trapcom[isig])
-+ free(shp->st.trapcom[isig]);
-+ memcpy((char*)&shp->st.trapcom[0],savsig,nsig*sizeof(char*));
- free((void*)savsig);
- }
- shp->options = sp->options;