BSD 4_4_Lite1 release

[unix-history] / usr / src / lib / libc / stdio / findfp.c

diff --git a/usr/src/lib/libc/stdio/findfp.c b/usr/src/lib/libc/stdio/findfp.c
index d5172de..64548db 100644 (file)
--- a/usr/src/lib/libc/stdio/findfp.c
+++ b/usr/src/lib/libc/stdio/findfp.c
@@ -1,17 +1,44 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)findfp.c   5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)findfp.c   8.2 (Berkeley) 1/4/94";

 #endif /* LIBC_SCCS and not lint */
 
 #endif /* LIBC_SCCS and not lint */
 

+#include <sys/param.h>

 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>


@@ -22,15 +49,15 @@ static char sccsid[] = "@(#)findfp.c        5.10 (Berkeley) %G%";
 
 int    __sdidinit;
 
 
 int    __sdidinit;
 

-#define NSTATIC        20      /* stdin + stdout + stderr + the usual */
-#define        NDYNAMIC 10     /* add ten more whenever necessary */
+#define        NDYNAMIC 10             /* add ten more whenever necessary */

 
 #define        std(flags, file) \
        {0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite}
 /*      p r w flags file _bf z  cookie      close    read    seek    write */
 
 
 #define        std(flags, file) \
        {0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite}
 /*      p r w flags file _bf z  cookie      close    read    seek    write */
 

-static FILE usual[NSTATIC - 3];        /* the usual */
-static struct glue uglue = { 0, NSTATIC - 3, usual };
+                               /* the usual - (stdin + stdout + stderr) */
+static FILE usual[FOPEN_MAX - 3];
+static struct glue uglue = { 0, FOPEN_MAX - 3, usual };

 
 FILE __sF[3] = {
        std(__SRD, STDIN_FILENO),               /* stdin */
 
 FILE __sF[3] = {
        std(__SRD, STDIN_FILENO),               /* stdin */


@@ -47,10 +74,10 @@ moreglue(n)
        register FILE *p;
        static FILE empty;
 
        register FILE *p;
        static FILE empty;
 

-       g = (struct glue *)malloc(sizeof(*g) + n * sizeof(FILE));
+       g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE));

        if (g == NULL)
                return (NULL);
        if (g == NULL)
                return (NULL);

-       p = (FILE *)(g + 1);
+       p = (FILE *)ALIGN(g + 1);

        g->next = NULL;
        g->niobs = n;
        g->iobs = p;
        g->next = NULL;
        g->niobs = n;
        g->iobs = p;


@@ -102,9 +129,10 @@ found:
  */
 f_prealloc()
 {
  */
 f_prealloc()
 {

-       int n = getdtablesize() - NSTATIC + 20;         /* 20 for slop */

        register struct glue *g;
        register struct glue *g;

+       int n;

 
 

+       n = getdtablesize() - FOPEN_MAX + 20;           /* 20 for slop. */

        for (g = &__sglue; (n -= g->niobs) > 0 && g->next; g = g->next)
                /* void */;
        if (n > 0)
        for (g = &__sglue; (n -= g->niobs) > 0 && g->next; g = g->next)
                /* void */;
        if (n > 0)