--- BDB/BDB.xs	2007/12/22 07:33:48	1.28
+++ BDB/BDB.xs	2008/03/30 06:28:08	1.34
@@ -42,8 +42,14 @@
 typedef DB          DB_ornull;
 typedef DB_SEQUENCE DB_SEQUENCE_ornull;
 
+typedef DB_ENV      DB_ENV_ornuked;
+typedef DB_TXN      DB_TXN_ornuked;
+typedef DBC         DBC_ornuked;
+typedef DB          DB_ornuked;
+typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
+
 typedef SV SV8; /* byte-sv, used for argument-checking */
-typedef char *octetstring;
+typedef char *bdb_filename;
 
 static SV *prepare_cb;
 
@@ -57,6 +63,20 @@
 # define c_put   put   
 #endif
 
+static char *
+get_bdb_filename (SV *sv)
+{
+  return !SvOK (sv)
+            ? 0
+            :
+#if WIN32
+              SvPVutf8_nolen (sv)
+#else
+              SvPVbyte_nolen (sv)
+#endif
+         ;
+}
+
 static void
 debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
 {
@@ -201,7 +221,7 @@
 
 #if WORDACCESS_UNSAFE
 
-static unsigned int get_nready ()
+static unsigned int get_nready (void)
 {
   unsigned int retval;
 
@@ -212,7 +232,7 @@
   return retval;
 }
 
-static unsigned int get_npending ()
+static unsigned int get_npending (void)
 {
   unsigned int retval;
 
@@ -223,7 +243,7 @@
   return retval;
 }
 
-static unsigned int get_nthreads ()
+static unsigned int get_nthreads (void)
 {
   unsigned int retval;
 
@@ -296,7 +316,7 @@
   abort ();
 }
 
-static int poll_cb ();
+static int poll_cb (void);
 static void req_free (bdb_req req);
 static void req_cancel (bdb_req req);
 
@@ -387,7 +407,7 @@
 #endif
 
 static void
-create_respipe ()
+create_respipe (void)
 {
 #ifdef _WIN32
   int arg; /* argg */
@@ -451,7 +471,7 @@
   X_UNLOCK (wrklock);
 }
 
-static void maybe_start_thread ()
+static void maybe_start_thread (void)
 {
   if (get_nthreads () >= wanted)
     return;
@@ -546,7 +566,7 @@
     end_thread ();
 }
 
-static void poll_wait ()
+static void poll_wait (void)
 {
   fd_set rfd;
 
@@ -569,7 +589,7 @@
     }
 }
 
-static int poll_cb ()
+static int poll_cb (void)
 {
   dSP;
   int count = 0;
@@ -924,10 +944,10 @@
 #define REQ_SEND						\
   req_send (req)
 
-#define SvPTR(var, arg, type, class, nullok)                    		\
+#define SvPTR(var, arg, type, class, nullok)                   			\
   if (!SvOK (arg))								\
     {										\
-      if (!nullok)								\
+      if (nullok != 1)								\
         croak (# var " must be a " # class " object, not undef");		\
 										\
       (var) = 0;								\
@@ -936,7 +956,7 @@
     {                                                           		\
       IV tmp = SvIV ((SV*) SvRV (arg));                         		\
       (var) = INT2PTR (type, tmp);                              		\
-      if (!var)									\
+      if (!var && nullok != 2)									\
         croak (# var " is not a valid " # class " object anymore");		\
     }                                                           		\
   else                                                          		\
@@ -950,6 +970,45 @@
   sv_setiv (SvRV (sv), 0);
 }
 
+static int
+errno_get (pTHX_ SV *sv, MAGIC *mg)
+{
+  if (*mg->mg_ptr == '!') // should always be the case
+    if (-30999 <= errno && errno <= -30800)
+      {
+        sv_setnv (sv, (NV)errno);
+        sv_setpv (sv, db_strerror (errno));
+        SvNOK_on (sv); /* what a wonderful hack! */
+                       // ^^^ copied from perl sources
+        return 0;
+      }
+
+  return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
+}
+
+static MGVTBL vtbl_errno;
+
+// this wonderful hack :( patches perl's $! variable to support our errno values
+static void
+patch_errno (void)
+{
+  SV *sv;
+  MAGIC *mg;
+
+  if (!(sv = get_sv ("!", 1)))
+    return;
+
+  if (!(mg = mg_find (sv, PERL_MAGIC_sv)))
+    return;
+
+  if (mg->mg_virtual != &PL_vtbl_sv)
+    return;
+
+  vtbl_errno = PL_vtbl_sv;
+  vtbl_errno.svt_get = errno_get;
+  mg->mg_virtual = &vtbl_errno;
+}
+
 MODULE = BDB                PACKAGE = BDB
 
 PROTOTYPES: ENABLE
@@ -1155,6 +1214,7 @@
 
         X_COND_CHECK  (reqwait);
 #endif
+        patch_errno ();
 }
 
 void
@@ -1322,13 +1382,11 @@
 	RETVAL
 
 void
-db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
+db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
 	CODE:
 {
         dREQ (REQ_ENV_OPEN);
 
-  	env->set_thread_count (env, wanted + 2);
-
         req->env   = env;
         req->uint1 = open_flags | DB_THREAD;
         req->int1  = mode;
@@ -1405,7 +1463,7 @@
 	RETVAL
 
 void
-db_open (DB *db, DB_TXN_ornull *txnid, octetstring file, octetstring database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
+db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
 	CODE:
 {
         dREQ (REQ_DB_OPEN);
@@ -1455,7 +1513,7 @@
 }
 
 void
-db_upgrade (DB *db, octetstring file, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = &PL_sv_undef)
 	CODE:
 {
         dREQ (REQ_DB_SYNC);
@@ -1715,7 +1773,7 @@
 MODULE = BDB		PACKAGE = BDB::Env
 
 void
-DESTROY (DB_ENV_ornull *env)
+DESTROY (DB_ENV_ornuked *env)
 	CODE:
         if (env)
           env->close (env, 0);
@@ -1872,7 +1930,7 @@
 MODULE = BDB		PACKAGE = BDB::Db
 
 void
-DESTROY (DB_ornull *db)
+DESTROY (DB_ornuked *db)
 	CODE:
         if (db)
           {
@@ -1977,7 +2035,7 @@
 MODULE = BDB		PACKAGE = BDB::Txn
 
 void
-DESTROY (DB_TXN_ornull *txn)
+DESTROY (DB_TXN_ornuked *txn)
 	CODE:
         if (txn)
           txn->abort (txn);
@@ -1998,7 +2056,7 @@
 MODULE = BDB		PACKAGE = BDB::Cursor
 
 void
-DESTROY (DBC_ornull *dbc)
+DESTROY (DBC_ornuked *dbc)
 	CODE:
         if (dbc)
           dbc->c_close (dbc);
@@ -2014,7 +2072,7 @@
 MODULE = BDB		PACKAGE = BDB::Sequence
 
 void
-DESTROY (DB_SEQUENCE_ornull *seq)
+DESTROY (DB_SEQUENCE_ornuked *seq)
 	CODE:
         if (seq)
           seq->close (seq, 0);
@@ -2043,3 +2101,4 @@
 	OUTPUT:
         RETVAL
 
+