Changeset 976

Timestamp:

Jan 11, 2004, 8:27:30 PM (22 years ago)

Author:

bird

Message:

Initial porting.

Location:

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

Files:

• btree/bt_conv.c (modified) (1 diff, 1 prop)
• btree/bt_debug.c (modified) (1 diff, 1 prop)
• btree/bt_delete.c (modified) (2 diffs, 1 prop)
• btree/bt_get.c (modified) (1 diff, 1 prop)
• btree/bt_open.c (modified) (2 diffs, 1 prop)
• btree/bt_overflow.c (modified) (1 diff, 1 prop)
• btree/bt_page.c (modified) (1 diff, 1 prop)
• btree/bt_put.c (modified) (1 diff, 1 prop)
• btree/bt_search.c (modified) (1 diff, 1 prop)
• btree/bt_seq.c (modified) (1 diff, 1 prop)
• btree/bt_split.c (modified) (1 diff, 1 prop)
• btree/bt_utils.c (modified) (1 diff, 1 prop)
• db.smak (modified) (1 diff, 1 prop)
• db/db.c (modified) (2 diffs, 1 prop)
• recno/rec_close.c (modified) (2 diffs, 1 prop)
• recno/rec_delete.c (modified) (1 diff, 1 prop)
• recno/rec_get.c (modified) (1 diff, 1 prop)
• recno/rec_open.c (modified) (2 diffs, 1 prop)
• recno/rec_put.c (modified) (2 diffs, 1 prop)
• recno/rec_search.c (modified) (1 diff, 1 prop)
• recno/rec_seq.c (modified) (1 diff, 1 prop)
• recno/rec_utils.c (modified) (1 diff, 1 prop)

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_conv.c   8.5 (Berkeley) 8/17/94";

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_debug.c  8.5 (Berkeley) 8/17/94";

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_delete.c 8.13 (Berkeley) 7/28/94";
@@ -574 +575 @@
                 }
                 /* Check previous key, if not at the beginning of the page. */
-                if (index > 0) { 
+                if (index > 0) {
                         e.page = h;
                         e.index = index - 1;

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_get.c    8.6 (Berkeley) 7/20/94";

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_open.c   8.10 (Berkeley) 8/17/94";
@@ -396 +397 @@
         char path[MAXPATHLEN];
 
+#ifndef __EMX__ /* bird */
         if (issetugid() == 0)
+#endif
                 envtmp = getenv("TMPDIR");
         (void)snprintf(path,

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_overflow.c       8.5 (Berkeley) 7/16/94";

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

@@ -32 +32 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_page.c   8.3 (Berkeley) 7/14/94";

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_put.c    8.8 (Berkeley) 7/26/94";

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_search.c 8.8 (Berkeley) 7/31/94";

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_seq.c    8.7 (Berkeley) 7/20/94";

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_split.c  8.9 (Berkeley) 7/26/94";

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bt_utils.c  8.8 (Berkeley) 7/20/94";

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

@@ +1 @@
+libc.TSRC += $(wildcard src/lib/bsd/db/btree/*.c)
+libc.TSRC += $(wildcard src/lib/bsd/db/db/*.c)
 libc.TSRC += $(wildcard src/lib/bsd/db/hash/*.c)
+libc.TSRC += $(wildcard src/lib/bsd/db/mpool/*.c)
+libc.TSRC += $(wildcard src/lib/bsd/db/recno/*.c)

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

@@ -32 +32 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)db.c        8.4 (Berkeley) 2/21/94";
@@ -56 +57 @@
 
 #define DB_FLAGS        (DB_LOCK | DB_SHMEM | DB_TXN)
+#ifdef __EMX__ /* TODO: add the missing flags! */
+#define USE_OPEN_FLAGS                                                  \
+        (O_CREAT | O_EXCL /*| O_EXLOCK*/ | O_NONBLOCK | O_RDONLY |              \
+         O_RDWR | /*O_SHLOCK |*/ O_TRUNC)
+#else
 #define USE_OPEN_FLAGS                                                  \
         (O_CREAT | O_EXCL | O_EXLOCK | O_NONBLOCK | O_RDONLY |          \
          O_RDWR | O_SHLOCK | O_TRUNC)
+#endif
 
         if ((flags & ~(USE_OPEN_FLAGS | DB_FLAGS)) == 0)

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

@@ -41 +41 @@
 #include <sys/types.h>
 #include <sys/uio.h>
+#ifndef __EMX__
 #include <sys/mman.h>
+#endif
 
 #include <errno.h>
@@ -81 +83 @@
         /* Committed to closing. */
         status = RET_SUCCESS;
+#ifndef __EMX__
         if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize))
                 status = RET_ERROR;
+#endif
 
         if (!F_ISSET(t, R_INMEM)) {

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rec_delete.c        8.7 (Berkeley) 7/14/94";

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

@@ -32 +32 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rec_get.c   8.9 (Berkeley) 8/18/94";

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

@@ -35 +35 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rec_open.c  8.10 (Berkeley) 9/1/94";
@@ -43 +44 @@
 #include "namespace.h"
 #include <sys/types.h>
+#ifndef __EMX__
 #include <sys/mman.h>
+#endif
 #include <sys/stat.h>
 

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

@@ -32 +32 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rec_put.c   8.7 (Berkeley) 8/18/94";
@@ -91 +92 @@
 
                 if (t->bt_rdata.size < t->bt_reclen) {
-                        t->bt_rdata.data = 
+                        t->bt_rdata.data =
                             reallocf(t->bt_rdata.data, t->bt_reclen);
                         if (t->bt_rdata.data == NULL)

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

@@ -32 +32 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rec_search.c        8.4 (Berkeley) 7/14/94";

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

@@ -32 +32 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #include <sys/cdefs.h>
 #ifndef lint

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

@@ -32 +32 @@
  */
 
+#include "libc-alias.h" /*bird*/
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rec_utils.c 8.6 (Berkeley) 7/16/94";