diff --git a/bin/csh/func.c b/bin/csh/func.c index 0ad3ba40785e..71be6b872cb9 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -33,7 +33,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)func.c 5.20 (Berkeley) 6/27/91";*/ -static char rcsid[] = "$Id: func.c,v 1.4 1993/08/01 19:00:43 mycroft Exp $"; +static char rcsid[] = "$Id: func.c,v 1.5 1993/08/23 16:04:39 mycroft Exp $"; #endif /* not lint */ #include @@ -1045,7 +1045,7 @@ static struct limits { RLIMIT_RSS, "memoryuse", 1024, "kbytes", RLIMIT_MEMLOCK, "memorylocked", 1024, "kbytes", RLIMIT_NPROC, "maxproc", 1, "", - RLIMIT_OFILE, "openfiles", 1, "", + RLIMIT_NOFILE, "openfiles", 1, "", -1, NULL, 0, NULL }; diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a8860afbc711..312fc6115599 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1 +1 @@ -revision 1.22 intentionally removed +revision 1.23 intentionally removed diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index a6e3f2871612..37ba0a781f5b 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1 +1 @@ -revision 1.7 intentionally removed +revision 1.8 intentionally removed diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index a6e3f2871612..37ba0a781f5b 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -1 +1 @@ -revision 1.7 intentionally removed +revision 1.8 intentionally removed diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c index 88021088cb7a..abca45a642b3 100644 --- a/sys/miscfs/fdesc/fdesc_vfsops.c +++ b/sys/miscfs/fdesc/fdesc_vfsops.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: fdesc_vfsops.c,v 1.4 1993/06/07 05:25:20 cgd Exp $ + * $Id: fdesc_vfsops.c,v 1.5 1993/08/23 16:02:46 mycroft Exp $ */ /* @@ -236,7 +236,7 @@ fdesc_statfs(mp, sbp, p) * limit is ever reduced below the current number * of open files... ] */ - lim = p->p_rlimit[RLIMIT_OFILE].rlim_cur; + lim = p->p_rlimit[RLIMIT_NOFILE].rlim_cur; fdp = p->p_fd; last = min(fdp->fd_nfiles, lim); freefd = 0; diff --git a/sys/sys/resource.h b/sys/sys/resource.h index 40a2ae86539a..64b04199e246 100644 --- a/sys/sys/resource.h +++ b/sys/sys/resource.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)resource.h 7.5 (Berkeley) 3/17/91 - * $Id: resource.h,v 1.3 1993/05/20 16:22:57 cgd Exp $ + * $Id: resource.h,v 1.4 1993/08/23 16:01:56 mycroft Exp $ */ #ifndef _SYS_RESOURCE_H_ @@ -86,7 +86,7 @@ struct rusage { #define RLIMIT_RSS 5 /* resident set size */ #define RLIMIT_MEMLOCK 6 /* locked-in-memory address space */ #define RLIMIT_NPROC 7 /* number of processes */ -#define RLIMIT_OFILE 8 /* number of open files */ +#define RLIMIT_NOFILE 8 /* number of open files */ #define RLIM_NLIMITS 9 /* number of resource limits */