mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Code Releases Activity

12568: check sysconf(_SC_OPEN_MAX) if available instead of OPEN_MAX/NOFILES.

Browse source
This commit is contained in:
Clint Adams 2000-08-08 14:57:02 +00:00
parent 3bca186819
commit cb89544d32
6 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2000-08-08 Clint Adams <schizo@debian.org>
* 12568: configure.in, Src/compat.c, Src/exec.c, Src/init.c,
Src/system.h: check sysconf(_SC_OPEN_MAX) if available instead
of OPEN_MAX/NOFILES.
2000-08-08 Sven Wischnowsky <wischnow@zsh.org>
* 12567: Completion/Linux/_rpm, Src/Zle/computil.c: handle the

21
Src/compat.c
View file

@ -171,6 +171,27 @@ zpathmax(char *dir)
}
#endif
#ifdef HAVE_SYSCONF
/* This is replaced by a macro from system.h if not HAVE_PATHCONF. *
* 0 is returned if _SC_OPEN_MAX is unavailable *
* -1 is returned on error *
* *
* Neither of these should happen, but resort to OPEN_MAX rather *
* than return 0 or -1 just in case. */
/**/
mod_export long
zopenmax(void)
{
long openmax;
openmax = sysconf(_SC_OPEN_MAX);
if(openmax < 1)
return OPEN_MAX;
else
return openmax;
}
#endif
/**/
mod_export char *

5
Src/exec.c
View file

@ -1404,8 +1404,11 @@ static void
closeallelse(struct multio *mn)
{
int i, j;
long openmax;
for (i = 0; i < OPEN_MAX; i++)
openmax = zopenmax();
for (i = 0; i < openmax; i++)
if (mn->pipe != i) {
for (j = 0; j < mn->ct; j++)
if (mn->fds[j] == i)

2
Src/init.c
View file

@ -1173,7 +1173,7 @@ zsh_main(int argc, char **argv)
break;
} while (zsh_name);
fdtable_size = OPEN_MAX;
fdtable_size = zopenmax();
fdtable = zcalloc(fdtable_size);
createoptiontable();

3
Src/system.h
View file

@ -220,6 +220,9 @@ struct timezone {
# define OPEN_MAX 64
# endif
#endif
#ifndef HAVE_SYSCONF
# define zopenmax() (long) OPEN_MAX
#endif
#ifdef HAVE_FCNTL_H
# include <fcntl.h>

2
configure.in
View file

@ -864,7 +864,7 @@ AC_CHECK_FUNCS(strftime difftime gettimeofday \
signgam \
putenv getenv \
brk sbrk \
pathconf)
pathconf sysconf)
AC_FUNC_STRCOLL
if test $ac_cv_func_setpgrp = yes; then