Blame SOURCES/ksh-20140929-safefd.patch

0c842d
diff -up ksh-20120801/src/cmd/ksh93/include/io.h.safefd ksh-20120801/src/cmd/ksh93/include/io.h
0c842d
--- ksh-20120801/src/cmd/ksh93/include/io.h.safefd	2015-03-03 18:21:40.544732158 +0100
0c842d
+++ ksh-20120801/src/cmd/ksh93/include/io.h	2015-03-03 18:22:16.284447849 +0100
0c842d
@@ -78,6 +78,7 @@ extern void 	sh_iorestore(Shell_t*,int,i
0c842d
 extern Sfio_t 	*sh_iostream(Shell_t*,int);
0c842d
 extern int	sh_redirect(Shell_t*,struct ionod*,int);
0c842d
 extern void 	sh_iosave(Shell_t *, int,int,char*);
0c842d
+extern int 	safefdnumber(Shell_t* shp, int sfd);
0c842d
 extern int 	sh_iovalidfd(Shell_t*, int);
0c842d
 extern int 	sh_inuse(Shell_t*, int);
0c842d
 extern void 	sh_iounsave(Shell_t*);
0c842d
diff -up ksh-20120801/src/cmd/ksh93/sh/io.c.safefd ksh-20120801/src/cmd/ksh93/sh/io.c
0c842d
--- ksh-20120801/src/cmd/ksh93/sh/io.c.safefd	2015-03-03 18:21:40.511732421 +0100
0c842d
+++ ksh-20120801/src/cmd/ksh93/sh/io.c	2015-03-03 18:21:40.544732158 +0100
0c842d
@@ -1724,6 +1724,25 @@ void sh_iosave(Shell_t *shp, register in
0c842d
 	}
0c842d
 }
0c842d
 
0c842d
+int safefdnumber(Shell_t* shp, int sfd)
0c842d
+{
0c842d
+	register int fd;
0c842d
+
0c842d
+	while(1)
0c842d
+	{
0c842d
+		for(fd=0; fd < shp->topfd; fd++)
0c842d
+		{
0c842d
+			if (filemap[fd].save_fd==sfd || filemap[fd].orig_fd==sfd || (fcntl(sfd, F_GETFD) != -1 || errno != EBADF))
0c842d
+			{
0c842d
+				sfd++;
0c842d
+				continue;
0c842d
+			}
0c842d
+		}
0c842d
+		break;
0c842d
+	}
0c842d
+	return sfd;
0c842d
+}
0c842d
+
0c842d
 /*
0c842d
  *  close all saved file descriptors
0c842d
  */
0c842d
diff -up ksh-20120801/src/cmd/ksh93/sh/subshell.c.safefd ksh-20120801/src/cmd/ksh93/sh/subshell.c
0c842d
--- ksh-20120801/src/cmd/ksh93/sh/subshell.c.safefd	2015-03-03 18:21:40.531732261 +0100
0c842d
+++ ksh-20120801/src/cmd/ksh93/sh/subshell.c	2015-03-03 18:21:40.544732158 +0100
0c842d
@@ -673,7 +673,7 @@ Sfio_t *sh_subshell(Shell_t *shp,Shnode_
0c842d
 			}
0c842d
 			if(iop && sffileno(iop)==1)
0c842d
 			{
0c842d
-				int fd=sfsetfd(iop,3);
0c842d
+				int fd=sfsetfd(iop,safefdnumber(shp,3));
0c842d
 				if(fd<0)
0c842d
 				{
0c842d
 					shp->toomany = 1;