add db.1.85
[nvi.git] / db.1.85 / PORT / ptx.2.0 / OTHER_PATCHES
blob891cccb833588b19429976543fe57b0f2df0b971
1 *** PORT/db/btree/bt_open.c.orig        1993/11/24 11:16:51
2 --- PORT/db/btree/bt_open.c     1993/11/24 12:38:12
3 ***************
4 *** 256,262 ****
5 --- 256,266 ----
6                  * Don't overflow the page offset type.
7                  */
8                 if (b.psize == 0) {
9 + #ifdef STBLKSIZE_NOT_AVAILABLE
10 +                       b.psize = 4096;
11 + #else
12                         b.psize = sb.st_blksize;
13 + #endif
14                         if (b.psize < MINPSIZE)
15                                 b.psize = MINPSIZE;
16                         if (b.psize > MAX_PAGE_OFFSET + 1)
17 *** PORT/db/recno/rec_open.c.orig       1993/11/29 18:26:26
18 --- PORT/db/recno/rec_open.c    1993/11/30 11:35:21
19 ***************
20 *** 159,164 ****
21 --- 159,167 ----
22                                 SET(t, R_EOF);
23                         else {
24                                 t->bt_msize = sb.st_size;
25 + #ifdef MMAP_NOT_AVAILABLE
26 +                               goto slow;
27 + #else
28                                 if ((t->bt_smap = mmap(NULL, t->bt_msize,
29                                     PROT_READ, MAP_PRIVATE, rfd,
30                                     (off_t)0)) == (caddr_t)-1)
31 ***************
32 *** 168,173 ****
33 --- 171,177 ----
34                                 t->bt_irec = ISSET(t, R_FIXLEN) ?
35                                     __rec_fmap : __rec_vmap;
36                                 SET(t, R_MEMMAPPED);
37 + #endif
38                         }
39                 }
40         }
41 *** PORT/db/hash/hash_log2.c.orig       1993/11/24 11:10:40
42 --- PORT/db/hash/hash_log2.c    1993/11/24 12:38:52
43 ***************
44 *** 40,50 ****
45   
46   #include <sys/types.h>
47   
48 ! u_int
49   __log2(num)
50 !       u_int num;
51   {
52 !       register u_int i, limit;
53   
54         limit = 1;
55         for (i = 0; limit < num; limit = limit << 1, i++);
56 --- 40,50 ----
57   
58   #include <sys/types.h>
59   
60 ! unsigned int
61   __log2(num)
62 !       unsigned int num;
63   {
64 !       register unsigned int i, limit;
65   
66         limit = 1;
67         for (i = 0; limit < num; limit = limit << 1, i++);
68 *** PORT/db/hash/hash.c.orig    1993/11/24 11:18:44
69 --- PORT/db/hash/hash.c 1993/11/24 12:38:29
70 ***************
71 *** 301,307 ****
72 --- 301,311 ----
73         if (file != NULL) {
74                 if (stat(file, &statbuf))
75                         return (NULL);
76 + #ifdef STBLKSIZE_NOT_AVAILABLE
77 +               hashp->BSIZE = 4096;
78 + #else
79                 hashp->BSIZE = statbuf.st_blksize;
80 + #endif
81                 hashp->BSHIFT = __log2(hashp->BSIZE);
82         }
83   
84 *** PORT/db/hash/hash.h.orig    1993/11/24 11:20:03
85 --- PORT/db/hash/hash.h 1993/11/24 12:38:38
86 ***************
87 *** 261,266 ****
88 --- 261,267 ----
89   #define       REAL_KEY        4
90   
91   /* Short hands for accessing structure */
92 + #undef BSIZE
93   #define BSIZE         hdr.bsize
94   #define BSHIFT                hdr.bshift
95   #define DSIZE         hdr.dsize