Changeset 979

Timestamp:

Jan 11, 2004, 8:58:48 PM (22 years ago)

Author:

bird

Message:

Merged in changes from the old port (src/emx/bsd/db).

Location:

trunk/src/emx/src/lib/bsd/db

Files:

• btree/bt_close.c (modified) (2 diffs, 1 prop)
• btree/bt_open.c (modified) (5 diffs, 1 prop)
• btree/btree.h (modified) (1 diff, 1 prop)
• db/db.c (modified) (1 diff, 1 prop)
• hash/hash.c (modified) (6 diffs, 1 prop)
• hash/hash.h (modified) (4 diffs, 1 prop)
• hash/hash_page.c (modified) (3 diffs, 1 prop)
• hash/ndbm.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/bsd/db/btree/bt_close.c

@@ -71 +71 @@
         BTREE *t;
         int fd;
+
+
+
+
 
         t = dbp->internal;
@@ -106 +110 @@
 
         fd = t->bt_fd;
+
+
+
+
+
+
+
+
+
+
+
+
+
         free(t);
         free(dbp);
         return (_close(fd) ? RET_ERROR : RET_SUCCESS);
+
 }
 

trunk/src/emx/src/lib/bsd/db/btree/bt_open.c

@@ -213 +213 @@
                 if ((flags & O_ACCMODE) != O_RDWR)
                         goto einval;
+
+
+
+
+
+
+
+
+
+
+
                 if ((t->bt_fd = tmp()) == -1)
                         goto err;
+
                 F_SET(t, B_INMEM);
         }
@@ -341 +353 @@
                 if (t->bt_fd != -1)
                         (void)_close(t->bt_fd);
+
+
+
+
+
+
                 free(t);
         }
@@ -389 +407 @@
 }
 
+
 static int
 tmp()
@@ -397 +416 @@
         char path[MAXPATHLEN];
 
-#ifndef __EMX__ /* bird */
         if (issetugid() == 0)
-#endif
                 envtmp = getenv("TMPDIR");
         (void)snprintf(path,
@@ -411 +428 @@
         return(fd);
 }
+
 
 static int

trunk/src/emx/src/lib/bsd/db/btree/btree.h

@@ -380 +380 @@
 #define B_DB_TXN        0x10000         /* DB_TXN specified. */
         u_int32_t flags;
+
+
+
 } BTREE;
 

trunk/src/emx/src/lib/bsd/db/db/db.c

@@ -60 +60 @@
 #define USE_OPEN_FLAGS                                                  \
         (O_CREAT | O_EXCL /*| O_EXLOCK*/ | O_NONBLOCK | O_RDONLY |              \
-         O_RDWR | /*O_SHLOCK |*/ O_TRUNC)
+         O_RDWR | /*O_SHLOCK |*/ O_TRUNC)
 #else
 #define USE_OPEN_FLAGS                                                  \

trunk/src/emx/src/lib/bsd/db/hash/hash.c

@@ -444 +444 @@
         if (hashp->fp != -1)
                 (void)_close(hashp->fp);
+
+
+
+
+
+
 
         free(hashp);
@@ -517 +523 @@
                 if (wsize != sizeof(HASHHDR)) {
                         errno = EFTYPE;
-                        hashp->error = errno;
+                        hashp->
                         return (-1);
                 }
@@ -548 +554 @@
         hashp = (HTAB *)dbp->internal;
         if (flag) {
-                hashp->error = errno = EINVAL;
+                hashp->
                 return (ERROR);
         }
@@ -565 +571 @@
         hashp = (HTAB *)dbp->internal;
         if (flag && flag != R_NOOVERWRITE) {
-                hashp->error = EINVAL;
+                hashp->
                 errno = EINVAL;
                 return (ERROR);
         }
         if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
-                hashp->error = errno = EPERM;
+                hashp->
                 return (ERROR);
         }
@@ -587 +593 @@
         hashp = (HTAB *)dbp->internal;
         if (flag && flag != R_CURSOR) {
-                hashp->error = errno = EINVAL;
+                hashp->
                 return (ERROR);
         }
         if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
-                hashp->error = errno = EPERM;
+                hashp->
                 return (ERROR);
         }
@@ -742 +748 @@
         hashp = (HTAB *)dbp->internal;
         if (flag && flag != R_FIRST && flag != R_NEXT) {
-                hashp->error = errno = EINVAL;
+                hashp->
                 return (ERROR);
         }

trunk/src/emx/src/lib/bsd/db/hash/hash.h

@@ -73 +73 @@
         int             ssize;          /* Segment Size */
         int             sshift;         /* Segment shift */
-        int             ovfl_point;     /* Where overflow pages are being 
+        int             ovfl_point;     /* Where overflow pages are being
                                          * allocated */
         int             last_freed;     /* Last overflow page freed */
         int             max_bucket;     /* ID of Maximum bucket in use */
         int             high_mask;      /* Mask to modulo into entire table */
-        int             low_mask;       /* Mask to modulo into lower half of 
+        int             low_mask;       /* Mask to modulo into lower half of
                                          * table */
         int             ffactor;        /* Fill factor */
@@ -84 +84 @@
         int             hdrpages;       /* Size of table header */
         int             h_charkey;      /* value of hash(CHARKEY) */
-#define NCACHED 32                      /* number of bit maps and spare 
+#define NCACHED 32                      /* number of bit maps and spare
                                          * points */
         int             spares[NCACHED];/* spare pages for overflow */
-        u_int16_t       bitmaps[NCACHED];       /* address of overflow page 
+        u_int16_t       bitmaps[NCACHED];       /* address of overflow page
                                                  * bitmaps */
 } HASHHDR;
@@ -94 +94 @@
         HASHHDR         hdr;            /* Header */
         int             nsegs;          /* Number of allocated segments */
-        int             exsegs;         /* Number of extra allocated 
+        int             exsegs;         /* Number of extra allocated
                                          * segments */
         u_int32_t                       /* Hash function */
@@ -105 +105 @@
         int             cbucket;        /* Current bucket */
         int             cndx;           /* Index of next item on cpage */
-        int             error;          /* Error Number -- for DBM 
-                                         * compatibility */
-        int             new_file;       /* Indicates if fd is backing store 
+        /* bird: this used to be errno but that crashes with the errno define in errno.h and stdlib.h. */
+        int             dbmerrno;       /* Error Number -- for DBM
+                                         * compatability */
+        int             new_file;       /* Indicates if fd is backing store
                                          * or no */
-        int             save_file;      /* Indicates whether we need to flush 
+        int             save_file;      /* Indicates whether we need to flush
                                          * file at
                                          * exit */
         u_int32_t       *mapp[NCACHED]; /* Pointers to page maps */
         int             nmaps;          /* Initial number of bitmaps */
-        int             nbufs;          /* Number of buffers left to 
+        int             nbufs;          /* Number of buffers left to
                                          * allocate */
         BUFHEAD         bufhead;        /* Header of buffer lru list */
         SEGMENT         *dir;           /* Hash Bucket directory */
+
+
+
 } HTAB;
 

trunk/src/emx/src/lib/bsd/db/hash/hash_page.c

@@ -69 +69 @@
 #ifdef DEBUG
 #include <assert.h>
+
+
+
 #endif
 #include "un-namespace.h"
@@ -868 +871 @@
 {
         sigset_t set, oset;
+
+
+
         static char namestr[] = "_hashXXXXXX";
+
 
         /* Block signals; make sure file goes away at process exit. */
@@ -874 +881 @@
         (void)_sigprocmask(SIG_BLOCK, &set, &oset);
         if ((hashp->fp = mkstemp(namestr)) != -1) {
+
+
+
+
+
+
                 (void)unlink(namestr);
+
                 (void)_fcntl(hashp->fp, F_SETFD, 1);
         }

trunk/src/emx/src/lib/bsd/db/hash/ndbm.c

@@ -211 +211 @@
 
         hp = (HTAB *)db->internal;
-        return (hp->error);
+        return (hp->
 }
 
@@ -221 +221 @@
 
         hp = (HTAB *)db->internal;
-        hp->error = 0;
+        hp->
         return (0);
 }