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