Deleted Added
full compact
rec_close.c (1573) rec_close.c (14272)
1/*-
1/*-
2 * Copyright (c) 1990, 1993
2 * Copyright (c) 1990, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright

--- 16 unchanged lines hidden (view full) ---

27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright

--- 16 unchanged lines hidden (view full) ---

27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35static char sccsid[] = "@(#)rec_close.c 8.3 (Berkeley) 2/21/94";
35static char sccsid[] = "@(#)rec_close.c 8.6 (Berkeley) 8/18/94";
36#endif /* LIBC_SCCS and not lint */
37
38#include <sys/types.h>
39#include <sys/uio.h>
40#include <sys/mman.h>
41
42#include <errno.h>
43#include <limits.h>

--- 27 unchanged lines hidden (view full) ---

71 t->bt_pinned = NULL;
72 }
73
74 if (__rec_sync(dbp, 0) == RET_ERROR)
75 return (RET_ERROR);
76
77 /* Committed to closing. */
78 status = RET_SUCCESS;
36#endif /* LIBC_SCCS and not lint */
37
38#include <sys/types.h>
39#include <sys/uio.h>
40#include <sys/mman.h>
41
42#include <errno.h>
43#include <limits.h>

--- 27 unchanged lines hidden (view full) ---

71 t->bt_pinned = NULL;
72 }
73
74 if (__rec_sync(dbp, 0) == RET_ERROR)
75 return (RET_ERROR);
76
77 /* Committed to closing. */
78 status = RET_SUCCESS;
79 if (ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize))
79 if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize))
80 status = RET_ERROR;
81
80 status = RET_ERROR;
81
82 if (!ISSET(t, R_INMEM))
83 if (ISSET(t, R_CLOSEFP)) {
82 if (!F_ISSET(t, R_INMEM))
83 if (F_ISSET(t, R_CLOSEFP)) {
84 if (fclose(t->bt_rfp))
85 status = RET_ERROR;
86 } else
87 if (close(t->bt_rfd))
88 status = RET_ERROR;
89
90 if (__bt_close(dbp) == RET_ERROR)
91 status = RET_ERROR;

--- 28 unchanged lines hidden (view full) ---

120 if (t->bt_pinned != NULL) {
121 mpool_put(t->bt_mp, t->bt_pinned, 0);
122 t->bt_pinned = NULL;
123 }
124
125 if (flags == R_RECNOSYNC)
126 return (__bt_sync(dbp, 0));
127
84 if (fclose(t->bt_rfp))
85 status = RET_ERROR;
86 } else
87 if (close(t->bt_rfd))
88 status = RET_ERROR;
89
90 if (__bt_close(dbp) == RET_ERROR)
91 status = RET_ERROR;

--- 28 unchanged lines hidden (view full) ---

120 if (t->bt_pinned != NULL) {
121 mpool_put(t->bt_mp, t->bt_pinned, 0);
122 t->bt_pinned = NULL;
123 }
124
125 if (flags == R_RECNOSYNC)
126 return (__bt_sync(dbp, 0));
127
128 if (ISSET(t, R_RDONLY | R_INMEM) || !ISSET(t, R_MODIFIED))
128 if (F_ISSET(t, R_RDONLY | R_INMEM) || !F_ISSET(t, R_MODIFIED))
129 return (RET_SUCCESS);
130
131 /* Read any remaining records into the tree. */
129 return (RET_SUCCESS);
130
131 /* Read any remaining records into the tree. */
132 if (!ISSET(t, R_EOF) && t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
132 if (!F_ISSET(t, R_EOF) && t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
133 return (RET_ERROR);
134
135 /* Rewind the file descriptor. */
136 if (lseek(t->bt_rfd, (off_t)0, SEEK_SET) != 0)
137 return (RET_ERROR);
138
133 return (RET_ERROR);
134
135 /* Rewind the file descriptor. */
136 if (lseek(t->bt_rfd, (off_t)0, SEEK_SET) != 0)
137 return (RET_ERROR);
138
139 iov[1].iov_base = "\n";
140 iov[1].iov_len = 1;
141 scursor = t->bt_rcursor;
139 /* Save the cursor. */
140 scursor = t->bt_cursor.rcursor;
142
143 key.size = sizeof(recno_t);
144 key.data = &trec;
145
141
142 key.size = sizeof(recno_t);
143 key.data = &trec;
144
146 status = (dbp->seq)(dbp, &key, &data, R_FIRST);
147 while (status == RET_SUCCESS) {
148 iov[0].iov_base = data.data;
149 iov[0].iov_len = data.size;
150 if (writev(t->bt_rfd, iov, 2) != data.size + 1)
151 return (RET_ERROR);
152 status = (dbp->seq)(dbp, &key, &data, R_NEXT);
153 }
154 t->bt_rcursor = scursor;
145 if (F_ISSET(t, R_FIXLEN)) {
146 /*
147 * We assume that fixed length records are all fixed length.
148 * Any that aren't are either EINVAL'd or corrected by the
149 * record put code.
150 */
151 status = (dbp->seq)(dbp, &key, &data, R_FIRST);
152 while (status == RET_SUCCESS) {
153 if (write(t->bt_rfd, data.data, data.size) != data.size)
154 return (RET_ERROR);
155 status = (dbp->seq)(dbp, &key, &data, R_NEXT);
156 }
157 } else {
158 iov[1].iov_base = &t->bt_bval;
159 iov[1].iov_len = 1;
160
161 status = (dbp->seq)(dbp, &key, &data, R_FIRST);
162 while (status == RET_SUCCESS) {
163 iov[0].iov_base = data.data;
164 iov[0].iov_len = data.size;
165 if (writev(t->bt_rfd, iov, 2) != data.size + 1)
166 return (RET_ERROR);
167 status = (dbp->seq)(dbp, &key, &data, R_NEXT);
168 }
169 }
170
171 /* Restore the cursor. */
172 t->bt_cursor.rcursor = scursor;
173
155 if (status == RET_ERROR)
156 return (RET_ERROR);
157 if ((off = lseek(t->bt_rfd, (off_t)0, SEEK_CUR)) == -1)
158 return (RET_ERROR);
159 if (ftruncate(t->bt_rfd, off))
160 return (RET_ERROR);
174 if (status == RET_ERROR)
175 return (RET_ERROR);
176 if ((off = lseek(t->bt_rfd, (off_t)0, SEEK_CUR)) == -1)
177 return (RET_ERROR);
178 if (ftruncate(t->bt_rfd, off))
179 return (RET_ERROR);
161 CLR(t, R_MODIFIED);
180 F_CLR(t, R_MODIFIED);
162 return (RET_SUCCESS);
163}
181 return (RET_SUCCESS);
182}