Blame SOURCES/ksh-20140929-safefd.patch

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