BSD 4_4_Lite1 release

[unix-history] / usr / src / lib / libc / db / recno / rec_open.c

diff --git a/usr/src/lib/libc/db/recno/rec_open.c b/usr/src/lib/libc/db/recno/rec_open.c
index 000ea29..2a0f354 100644 (file)
--- a/usr/src/lib/libc/db/recno/rec_open.c
+++ b/usr/src/lib/libc/db/recno/rec_open.c
@@ -5,11 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
  *
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
  *

- * %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[] = "@(#)rec_open.c 8.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)rec_open.c 8.6 (Berkeley) 2/22/94";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>


@@ -27,9 +53,9 @@ static char sccsid[] = "@(#)rec_open.c        8.2 (Berkeley) %G%";
 #include "recno.h"
 
 DB *
 #include "recno.h"
 
 DB *

-__rec_open(fname, flags, mode, openinfo)
+__rec_open(fname, flags, mode, openinfo, dflags)

        const char *fname;
        const char *fname;

-       int flags, mode;
+       int flags, mode, dflags;

        const RECNOINFO *openinfo;
 {
        BTREE *t;
        const RECNOINFO *openinfo;
 {
        BTREE *t;


@@ -57,9 +83,9 @@ __rec_open(fname, flags, mode, openinfo)
                btopeninfo.prefix = NULL;
                btopeninfo.lorder = openinfo->lorder;
                dbp = __bt_open(openinfo->bfname,
                btopeninfo.prefix = NULL;
                btopeninfo.lorder = openinfo->lorder;
                dbp = __bt_open(openinfo->bfname,

-                   O_RDWR, S_IRUSR | S_IWUSR, &btopeninfo);
+                   O_RDWR, S_IRUSR | S_IWUSR, &btopeninfo, dflags);

        } else
        } else

-               dbp = __bt_open(NULL, O_RDWR, S_IRUSR | S_IWUSR, NULL);
+               dbp = __bt_open(NULL, O_RDWR, S_IRUSR | S_IWUSR, NULL, dflags);

        if (dbp == NULL)
                goto err;
 
        if (dbp == NULL)
                goto err;
 


@@ -88,11 +114,13 @@ __rec_open(fname, flags, mode, openinfo)
                t->bt_rfd = rfd;
        t->bt_rcursor = 0;
 
                t->bt_rfd = rfd;
        t->bt_rcursor = 0;
 

-       /*
-        * In 4.4BSD stat(2) returns true for ISSOCK on pipes.  Until
-        * then, this is fairly close.  Pipes are read-only.
-        */

        if (fname != NULL) {
        if (fname != NULL) {

+               /*
+                * In 4.4BSD, stat(2) returns true for ISSOCK on pipes.
+                * Unfortunately, that's not portable, so we use lseek
+                * and check the errno values.
+                */
+               errno = 0;

                if (lseek(rfd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE) {
                        switch (flags & O_ACCMODE) {
                        case O_RDONLY:
                if (lseek(rfd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE) {
                        switch (flags & O_ACCMODE) {
                        case O_RDONLY:


@@ -187,6 +215,13 @@ __rec_fd(dbp)
 
        t = dbp->internal;
 
 
        t = dbp->internal;
 

+       /* Toss any page pinned across calls. */
+       if (t->bt_pinned != NULL) {
+               mpool_put(t->bt_mp, t->bt_pinned, 0);
+               t->bt_pinned = NULL;
+       }
+
+       /* In-memory database can't have a file descriptor. */

        if (ISSET(t, R_INMEM)) {
                errno = ENOENT;
                return (-1);
        if (ISSET(t, R_INMEM)) {
                errno = ENOENT;
                return (-1);