Attachment 938046 Details for Bug 1138751 – patch to fix this v2

patch to fix this v2

ksh-20140415-hokaido.patch (text/plain), 1.76 KB, created by Michal Hlavinka on 2014-09-16 14:38:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Hlavinka

Created: 2014-09-16 14:38:11 UTC

Size: 1.76 KB

patch

obsolete

>diff -up ksh-20120801/src/cmd/ksh93/sh/xec.c.hokaido ksh-20120801/src/cmd/ksh93/sh/xec.c
>--- ksh-20120801/src/cmd/ksh93/sh/xec.c.hokaido	2014-09-13 09:40:30.275993676 +0200
>+++ ksh-20120801/src/cmd/ksh93/sh/xec.c	2014-09-13 09:51:24.450116987 +0200
>@@ -96,6 +96,39 @@ struct funenv
>     }
> #endif /* !SHOPT_DEVFD */
> 
>+/* return -1 on error, 0 on fd closed, 1 on fd not using limiting buffer, 2 on fd using limiting buffer, 3 = don't know */
>+static int fdbuftype(fd)
>+{
>+  int saveerrno=errno;
>+  struct stat fst;
>+
>+  if (fstat(fd,&fst)== -1)
>+  {
>+    if (errno==EBADF)
>+    {
>+       errno=saveerrno;
>+       return 0;
>+    }
>+    errno=saveerrno;
>+    return -1;
>+  }
>+
>+  errno=saveerrno;
>+
>+  switch(fst.st_mode & S_IFMT)
>+  {
>+    case S_IFCHR: /*character devive*/
>+    case S_IFLNK: /*symlink*/
>+    case S_IFREG: /*regular file*/
>+      return 1;
>+    case S_IFSOCK:/*socket*/
>+    case S_IFIFO: /*fifo*/
>+      return 2;
>+    default: return 3;
>+  }
>+}
>+
>+
> /*
>  * The following two functions allow command substituion for non-builtins
>  * to use a pipe and to wait for the pipe to close before restoring to a
>@@ -1633,12 +1666,21 @@ int sh_exec(register const Shnode_t *t,
> #endif /* SHOPT_COSHELL */
> 			if(shp->subshell)
> 			{
>+				int comsubsave = shp->comsub;
>+				if(comsubsave==1)
>+					shp->comsub = 2;
> 				sh_subtmpfile(shp);
>+				shp->comsub = comsubsave;
>+				/* for comsub==1 workaround pipe buffer limit when such fd is used */
>+				if(shp->comsub==1 && ((!(shp->fdstatus[1]&IONOSEEK)) || fdbuftype(1)==2))
>+					unpipe = iousepipe(shp);
>+
> 				if((type&(FAMP|TFORK))==(FAMP|TFORK))
> 				{
> 					if(shp->comsub && !(shp->fdstatus[1]&IONOSEEK))
> 					{
>-						unpipe = iousepipe(shp);
>+						if (!unpipe)
>+							unpipe = iousepipe(shp);
> 						sh_subfork();
> 					}
> 				}

Actions: View

Attachments on bug 1138751: 937901 | 938046 | 938914