mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

42793: Always define FDT_PROC_SUBST even if not needed.

Browse source 
This avoids proliferating #ifdef's.
This commit is contained in:
Peter Stephenson 2018-05-17 10:00:37 +01:00
parent ee7dda7806
commit 1d2f684c9b
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2018-05-17 Peter Stephenson <p.stephenson@samsung.com>
* 42793: Src/jobs.c, Src/zsh.h: Always define FDT_PROC_SUBST to
avoid proliferating #ifdef's.
* 42785: Src/builtins.c: redefining a user math function should
silently work as with redefining other shell objects.

6
Src/jobs.c
View file

@ -1258,11 +1258,7 @@ pipecleanfilelist(LinkList filelist, int proc_subst_only)
while (node) {
Jobfile jf = (Jobfile)getdata(node);
if (jf->is_fd &&
(!proc_subst_only
#ifdef FDT_PROC_SUBST
|| fdtable[jf->u.fd] == FDT_PROC_SUBST
#endif
)) {
(!proc_subst_only || fdtable[jf->u.fd] == FDT_PROC_SUBST)) {
LinkNode next = nextnode(node);
zclose(jf->u.fd);
(void)remnode(filelist, node);

5
Src/zsh.h
View file

@ -454,15 +454,14 @@ enum {
* so the shell can still exec the last process.
*/
#define FDT_FLOCK_EXEC 6
#ifdef PATH_DEV_FD
/*
* Entry used by a process substition.
* This marker is not tested internally as we associated the file
* descriptor with a job for closing.
*
* This is not used unless PATH_DEV_FD is defined.
*/
#define FDT_PROC_SUBST 7
#endif
/*
* Mask to get the basic FDT type.
*/