=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/fdlim.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- src/usr.bin/ssh/Attic/fdlim.h 1999/09/26 20:53:36 1.1 +++ src/usr.bin/ssh/Attic/fdlim.h 1999/09/30 05:43:33 1.2 @@ -12,7 +12,7 @@ */ -/* RCSID("$Id: fdlim.h,v 1.1 1999/09/26 20:53:36 deraadt Exp $"); */ +/* RCSID("$Id: fdlim.h,v 1.2 1999/09/30 05:43:33 deraadt Exp $"); */ #ifndef FDLIM_H #define FDLIM_H @@ -20,38 +20,18 @@ static int fdlim_get (int hard) { -#ifdef RLIMIT_NOFILE struct rlimit rlfd; + if (getrlimit (RLIMIT_NOFILE, &rlfd) < 0) return (-1); -#ifdef RLIM_INFINITY /* not defined on HPSUX */ if ((hard ? rlfd.rlim_max : rlfd.rlim_cur) == RLIM_INFINITY) return 10000; else return hard ? rlfd.rlim_max : rlfd.rlim_cur; -#else /* RLIM_INFINITY */ - return hard ? rlfd.rlim_max : rlfd.rlim_cur; -#endif /* RLIM_INFINITY */ -#else /* !RLIMIT_NOFILE */ -#ifdef HAVE_GETDTABLESIZE - return (getdtablesize ()); -#else /* !HAVE_GETDTABLESIZE */ -#ifdef _SC_OPEN_MAX - return (sysconf (_SC_OPEN_MAX)); -#else /* !_SC_OPEN_MAX */ -#ifdef NOFILE - return (NOFILE); -#else /* !NOFILE */ - return (25); -#endif /* !NOFILE */ -#endif /* !_SC_OPEN_MAX */ -#endif /* !HAVE_GETDTABLESIZE */ -#endif /* !RLIMIT_NOFILE */ } static int fdlim_set (int lim) { -#ifdef RLIMIT_NOFILE struct rlimit rlfd; if (lim <= 0) return (-1); @@ -61,9 +41,6 @@ if (setrlimit (RLIMIT_NOFILE, &rlfd) < 0) return (-1); return (0); -#else /* !RLIMIT_NOFILE */ - return (-1); -#endif /* !RLIMIT_NOFILE */ } #endif /* FDLIM_H */