[Midnightbsd-cvs] src [10627] trunk/lib/libc/db/btree: tag
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 9 12:22:30 EDT 2018
Revision: 10627
http://svnweb.midnightbsd.org/src/?rev=10627
Author: laffer1
Date: 2018-06-09 12:22:29 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
tag
Modified Paths:
--------------
trunk/lib/libc/db/btree/bt_close.c
trunk/lib/libc/db/btree/bt_conv.c
trunk/lib/libc/db/btree/bt_debug.c
trunk/lib/libc/db/btree/bt_delete.c
trunk/lib/libc/db/btree/bt_get.c
trunk/lib/libc/db/btree/bt_open.c
trunk/lib/libc/db/btree/bt_overflow.c
trunk/lib/libc/db/btree/bt_page.c
trunk/lib/libc/db/btree/bt_put.c
trunk/lib/libc/db/btree/bt_search.c
Modified: trunk/lib/libc/db/btree/bt_close.c
===================================================================
--- trunk/lib/libc/db/btree/bt_close.c 2018-06-09 16:21:32 UTC (rev 10626)
+++ trunk/lib/libc/db/btree/bt_close.c 2018-06-09 16:22:29 UTC (rev 10627)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,7 @@
static char sccsid[] = "@(#)bt_close.c 8.7 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_close.c,v 1.9 2007/01/09 00:27:50 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libc/db/btree/bt_close.c 307641 2016-10-19 16:40:38Z pfg $");
#include "namespace.h"
#include <sys/param.h>
@@ -134,7 +135,8 @@
return (RET_ERROR);
}
- if (F_ISSET(t, B_INMEM | B_RDONLY) || !F_ISSET(t, B_MODIFIED))
+ if (F_ISSET(t, B_INMEM | B_RDONLY) ||
+ !F_ISSET(t, B_MODIFIED | B_METADIRTY))
return (RET_SUCCESS);
if (F_ISSET(t, B_METADIRTY) && bt_meta(t) == RET_ERROR)
Modified: trunk/lib/libc/db/btree/bt_conv.c
===================================================================
--- trunk/lib/libc/db/btree/bt_conv.c 2018-06-09 16:21:32 UTC (rev 10626)
+++ trunk/lib/libc/db/btree/bt_conv.c 2018-06-09 16:22:29 UTC (rev 10627)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,7 @@
static char sccsid[] = "@(#)bt_conv.c 8.5 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_conv.c,v 1.3 2007/01/09 00:27:50 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libc/db/btree/bt_conv.c 189291 2009-03-02 23:47:18Z delphij $");
#include <sys/param.h>
Modified: trunk/lib/libc/db/btree/bt_debug.c
===================================================================
--- trunk/lib/libc/db/btree/bt_debug.c 2018-06-09 16:21:32 UTC (rev 10626)
+++ trunk/lib/libc/db/btree/bt_debug.c 2018-06-09 16:22:29 UTC (rev 10627)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,7 @@
static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.4 2007/01/09 00:27:50 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libc/db/btree/bt_debug.c 190498 2009-03-28 07:31:02Z delphij $");
#include <sys/param.h>
Modified: trunk/lib/libc/db/btree/bt_delete.c
===================================================================
--- trunk/lib/libc/db/btree/bt_delete.c 2018-06-09 16:21:32 UTC (rev 10626)
+++ trunk/lib/libc/db/btree/bt_delete.c 2018-06-09 16:22:29 UTC (rev 10627)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,7 @@
static char sccsid[] = "@(#)bt_delete.c 8.13 (Berkeley) 7/28/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_delete.c,v 1.3 2007/01/09 00:27:50 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libc/db/btree/bt_delete.c 189327 2009-03-04 00:58:04Z delphij $");
#include <sys/types.h>
Modified: trunk/lib/libc/db/btree/bt_get.c
===================================================================
--- trunk/lib/libc/db/btree/bt_get.c 2018-06-09 16:21:32 UTC (rev 10626)
+++ trunk/lib/libc/db/btree/bt_get.c 2018-06-09 16:22:29 UTC (rev 10627)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,7 @@
static char sccsid[] = "@(#)bt_get.c 8.6 (Berkeley) 7/20/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_get.c,v 1.3 2007/01/09 00:27:50 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libc/db/btree/bt_get.c 189291 2009-03-02 23:47:18Z delphij $");
#include <sys/types.h>
Modified: trunk/lib/libc/db/btree/bt_open.c
===================================================================
--- trunk/lib/libc/db/btree/bt_open.c 2018-06-09 16:21:32 UTC (rev 10626)
+++ trunk/lib/libc/db/btree/bt_open.c 2018-06-09 16:22:29 UTC (rev 10627)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,7 @@
static char sccsid[] = "@(#)bt_open.c 8.10 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_open.c,v 1.12 2007/01/09 00:27:50 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libc/db/btree/bt_open.c 287480 2015-09-05 08:55:51Z kib $");
/*
* Implementation of btree access method for 4.4BSD.
@@ -57,6 +58,7 @@
#include <string.h>
#include <unistd.h>
#include "un-namespace.h"
+#include "libc_private.h"
#include <db.h>
#include "btree.h"
@@ -196,7 +198,7 @@
goto einval;
}
- if ((t->bt_fd = _open(fname, flags, mode)) < 0)
+ if ((t->bt_fd = _open(fname, flags | O_CLOEXEC, mode)) < 0)
goto err;
} else {
@@ -207,9 +209,6 @@
F_SET(t, B_INMEM);
}
- if (_fcntl(t->bt_fd, F_SETFD, 1) == -1)
- goto err;
-
if (_fstat(t->bt_fd, &sb))
goto err;
if (sb.st_size) {
@@ -404,10 +403,10 @@
}
(void)sigfillset(&set);
- (void)_sigprocmask(SIG_BLOCK, &set, &oset);
- if ((fd = mkstemp(path)) != -1)
+ (void)__libc_sigprocmask(SIG_BLOCK, &set, &oset);
+ if ((fd = mkostemp(path, O_CLOEXEC)) != -1)
(void)unlink(path);
- (void)_sigprocmask(SIG_SETMASK, &oset, NULL);
+ (void)__libc_sigprocmask(SIG_SETMASK, &oset, NULL);
return(fd);
}
Modified: trunk/lib/libc/db/btree/bt_overflow.c
===================================================================
--- trunk/lib/libc/db/btree/bt_overflow.c 2018-06-09 16:21:32 UTC (rev 10626)
+++ trunk/lib/libc/db/btree/bt_overflow.c 2018-06-09 16:22:29 UTC (rev 10627)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,7 @@
static char sccsid[] = "@(#)bt_overflow.c 8.5 (Berkeley) 7/16/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_overflow.c,v 1.4 2007/01/09 00:27:50 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libc/db/btree/bt_overflow.c 189387 2009-03-05 00:57:01Z delphij $");
#include <sys/param.h>
Modified: trunk/lib/libc/db/btree/bt_page.c
===================================================================
--- trunk/lib/libc/db/btree/bt_page.c 2018-06-09 16:21:32 UTC (rev 10626)
+++ trunk/lib/libc/db/btree/bt_page.c 2018-06-09 16:22:29 UTC (rev 10627)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,7 @@
static char sccsid[] = "@(#)bt_page.c 8.3 (Berkeley) 7/14/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_page.c,v 1.4 2007/01/09 00:27:50 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libc/db/btree/bt_page.c 190498 2009-03-28 07:31:02Z delphij $");
#include <sys/types.h>
Modified: trunk/lib/libc/db/btree/bt_put.c
===================================================================
--- trunk/lib/libc/db/btree/bt_put.c 2018-06-09 16:21:32 UTC (rev 10626)
+++ trunk/lib/libc/db/btree/bt_put.c 2018-06-09 16:22:29 UTC (rev 10627)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,7 @@
static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.5 2007/01/09 00:27:50 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libc/db/btree/bt_put.c 190484 2009-03-28 05:45:29Z delphij $");
#include <sys/types.h>
Modified: trunk/lib/libc/db/btree/bt_search.c
===================================================================
--- trunk/lib/libc/db/btree/bt_search.c 2018-06-09 16:21:32 UTC (rev 10626)
+++ trunk/lib/libc/db/btree/bt_search.c 2018-06-09 16:22:29 UTC (rev 10627)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,7 @@
static char sccsid[] = "@(#)bt_search.c 8.8 (Berkeley) 7/31/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_search.c,v 1.3 2007/01/09 00:27:50 imp Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libc/db/btree/bt_search.c 189292 2009-03-03 02:16:12Z delphij $");
#include <sys/types.h>
More information about the Midnightbsd-cvs
mailing list