• unify ksh_dup2() usage, use bool where appropriate

• apply diff from mirbsdksh-1.11:
  #ifdef DUP2_BROKEN
  /* Ultrix systems like to preserve the close-on-exec flag */
  ‣ XXX we do #ifdef __ultrix here (imake-style) instead of mirtoconfing it
    (but does anyone know of any other OS with the same problem? plus we’d
    see it as we now know the symptoms)
• remove ultrix Build.hs warn=' but might work…' in the hope it DOES
This commit is contained in:
tg
2008-04-01 20:40:22 +00:00
parent 47a7d246ca
commit e8d61a1d99
6 changed files with 23 additions and 20 deletions

15
main.c
View File

@ -13,7 +13,7 @@
#include <locale.h>
#endif
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.94 2008/03/28 18:47:52 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.95 2008/04/01 20:40:21 tg Exp $");
extern char **environ;
@ -922,14 +922,19 @@ initio(void)
/* A dup2() with error checking */
int
ksh_dup2(int ofd, int nfd, int errok)
ksh_dup2(int ofd, int nfd, bool errok)
{
int ret = dup2(ofd, nfd);
int rv;
if (ret < 0 && errno != EBADF && !errok)
if (((rv = dup2(ofd, nfd)) < 0) && !errok && (errno != EBADF))
errorf("too many files open in shell");
return ret;
#ifdef __ultrix
if (rv >= 0)
fcntl(nfd, F_SETFD, 0);
#endif
return (rv);
}
/*