diff options
| author | mp <mp@FreeBSD.org> | 2004-07-11 02:17:56 +0000 |
|---|---|---|
| committer | mp <mp@FreeBSD.org> | 2004-07-11 02:17:56 +0000 |
| commit | fc6d10ab3edf803f748e673fdd1f64a3d9640ca2 (patch) | |
| tree | d96ddad6fded51e784b4b77eea8ca0d82efa5497 /contrib/tcsh/sh.misc.c | |
| parent | 240d7c6f403b210d3609f1593f55dd73266bc844 (diff) | |
| parent | bbd1addf8f9452690ad13ce5b875ee4cc9633958 (diff) | |
| download | FreeBSD-src-fc6d10ab3edf803f748e673fdd1f64a3d9640ca2.zip FreeBSD-src-fc6d10ab3edf803f748e673fdd1f64a3d9640ca2.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r131962,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/tcsh/sh.misc.c')
| -rw-r--r-- | contrib/tcsh/sh.misc.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/contrib/tcsh/sh.misc.c b/contrib/tcsh/sh.misc.c index eeb2a26..8b1cc51 100644 --- a/contrib/tcsh/sh.misc.c +++ b/contrib/tcsh/sh.misc.c @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/sh.misc.c,v 3.24 2002/03/08 17:36:46 christos Exp $ */ +/* $Header: /src/pub/tcsh/sh.misc.c,v 3.26 2003/03/12 19:14:51 christos Exp $ */ /* * sh.misc.c: Miscelaneous functions */ @@ -32,7 +32,7 @@ */ #include "sh.h" -RCSID("$Id: sh.misc.c,v 3.24 2002/03/08 17:36:46 christos Exp $") +RCSID("$Id: sh.misc.c,v 3.26 2003/03/12 19:14:51 christos Exp $") static int renum __P((int, int)); static Char **blkend __P((Char **)); @@ -258,6 +258,11 @@ closem() { register int f; +#ifdef NLS_BUGS +#ifdef NLS_CATALOGS + (void)catclose(catd); +#endif /* NLS_CATALOGS */ +#endif /* NLS_BUGS */ #ifdef YPBUGS /* suggested by Justin Bur; thanks to Karl Kleinpaste */ fix_yp_bugs(); @@ -273,9 +278,14 @@ closem() (void) close(f); #ifdef NISPLUS if(f < 3) - (void) open(_PATH_DEVNULL, O_RDONLY); + (void) open(_PATH_DEVNULL, O_RDONLY|O_LARGEFILE); #endif /* NISPLUS */ } +#ifdef NLS_BUGS +#ifdef NLS_CATALOGS + nlsinit(); +#endif /* NLS_CATALOGS */ +#endif /* NLS_BUGS */ } #ifndef CLOSE_ON_EXEC @@ -315,7 +325,7 @@ donefds() didfds = 0; #ifdef NISPLUS { - int fd = open(_PATH_DEVNULL, O_RDONLY); + int fd = open(_PATH_DEVNULL, O_RDONLY|O_LARGEFILE); (void) dup2(fd, 1); (void) dup2(fd, 2); if (fd != 0) { |
