summaryrefslogtreecommitdiff
path: root/db2/common
diff options
context:
space:
mode:
Diffstat (limited to 'db2/common')
-rw-r--r--db2/common/db_appinit.c21
-rw-r--r--db2/common/db_apprec.c29
-rw-r--r--db2/common/db_err.c12
-rw-r--r--db2/common/db_region.c23
4 files changed, 51 insertions, 34 deletions
diff --git a/db2/common/db_appinit.c b/db2/common/db_appinit.c
index 74ba9ff426..05fc7cc084 100644
--- a/db2/common/db_appinit.c
+++ b/db2/common/db_appinit.c
@@ -8,7 +8,7 @@
#include "config.h"
#ifndef lint
-static const char sccsid[] = "@(#)db_appinit.c 10.36 (Sleepycat) 10/28/97";
+static const char sccsid[] = "@(#)db_appinit.c 10.37 (Sleepycat) 11/25/97";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -108,10 +108,23 @@ db_appinit(db_home, db_config, dbenv, flags)
if ((ret = __db_parse(dbenv, *p)) != 0)
goto err;
- /* Parse the config file. */
+ /*
+ * Parse the config file.
+ *
+ * XXX
+ * Don't use sprintf(3)/snprintf(3) -- the former is dangerous, and
+ * the latter isn't standard, and we're manipulating strings handed
+ * us by the application.
+ */
if (dbenv->db_home != NULL) {
- (void)snprintf(buf,
- sizeof(buf), "%s/DB_CONFIG", dbenv->db_home);
+#define CONFIG_NAME "/DB_CONFIG"
+ if (strlen(dbenv->db_home) +
+ strlen(CONFIG_NAME) + 1 > sizeof(buf)) {
+ ret = ENAMETOOLONG;
+ goto err;
+ }
+ (void)strcpy(buf, dbenv->db_home);
+ (void)strcat(buf, CONFIG_NAME);
if ((fp = fopen(buf, "r")) != NULL) {
while (fgets(buf, sizeof(buf), fp) != NULL) {
if ((lp = strchr(buf, '\n')) != NULL)
diff --git a/db2/common/db_apprec.c b/db2/common/db_apprec.c
index ac0176d70f..188c6b9f95 100644
--- a/db2/common/db_apprec.c
+++ b/db2/common/db_apprec.c
@@ -11,7 +11,7 @@
static const char copyright[] =
"@(#) Copyright (c) 1997\n\
Sleepycat Software Inc. All rights reserved.\n";
-static const char sccsid[] = "@(#)db_apprec.c 10.18 (Sleepycat) 9/30/97";
+static const char sccsid[] = "@(#)db_apprec.c 10.19 (Sleepycat) 11/23/97";
#endif
#ifndef NO_SYSTEM_INCLUDES
@@ -72,10 +72,8 @@ __db_apprec(dbenv, flags)
if (LF_ISSET(DB_RECOVER_FATAL))
first_flag = DB_FIRST;
else {
- if ((ret = __log_findckp(lp, &lsn)) == DB_NOTFOUND) {
- F_SET(lp, is_thread);
- return (0);
- }
+ if ((ret = __log_findckp(lp, &lsn)) == DB_NOTFOUND)
+ goto out;
first_flag = DB_SET;
}
@@ -88,7 +86,7 @@ __db_apprec(dbenv, flags)
(u_long)lsn.file, (u_long)lsn.offset);
else
__db_err(dbenv, "Retrieving first LSN");
- goto err;
+ goto out;
}
first_lsn = lsn;
@@ -99,7 +97,7 @@ __db_apprec(dbenv, flags)
if ((ret =
log_get(dbenv->lg_info, &lsn, &data, DB_NEXT)) != 0) {
if (ret != DB_NOTFOUND)
- goto err;
+ goto out;
break;
}
}
@@ -123,7 +121,7 @@ __db_apprec(dbenv, flags)
goto msgerr;
}
if (ret != 0 && ret != DB_NOTFOUND)
- goto err;
+ goto out;
for (ret = log_get(lp, &lsn, &data, DB_NEXT);
ret == 0; ret = log_get(lp, &lsn, &data, DB_NEXT)) {
@@ -134,7 +132,7 @@ __db_apprec(dbenv, flags)
goto msgerr;
}
if (ret != DB_NOTFOUND)
- goto err;
+ goto out;
/* Now close all the db files that are open. */
__log_close_files(lp);
@@ -148,7 +146,7 @@ __db_apprec(dbenv, flags)
dbenv->tx_info->region->last_ckp = ckp_lsn;
dbenv->tx_info->region->time_ckp = (u_int32_t)now;
if ((ret = txn_checkpoint(dbenv->tx_info, 0, 0)) != 0)
- goto err;
+ goto out;
if (dbenv->db_verbose) {
__db_err(lp->dbenv, "Recovery complete at %s", ctime(&now));
@@ -160,12 +158,13 @@ __db_apprec(dbenv, flags)
(u_long)dbenv->tx_info->region->last_ckp.offset);
}
- F_SET(lp, is_thread);
- return (0);
+ if (0) {
+msgerr: __db_err(dbenv, "Recovery function for LSN %lu %lu failed",
+ (u_long)lsn.file, (u_long)lsn.offset);
+ }
-msgerr: __db_err(dbenv, "Recovery function for LSN %lu %lu failed",
- (u_long)lsn.file, (u_long)lsn.offset);
+out: F_SET(lp, is_thread);
+ __db_txnlist_end(txninfo);
-err: F_SET(lp, is_thread);
return (ret);
}
diff --git a/db2/common/db_err.c b/db2/common/db_err.c
index f3e7b40448..13f2cb5dc3 100644
--- a/db2/common/db_err.c
+++ b/db2/common/db_err.c
@@ -8,7 +8,7 @@
#include "config.h"
#ifndef lint
-static const char sccsid[] = "@(#)db_err.c 10.18 (Sleepycat) 8/27/97";
+static const char sccsid[] = "@(#)db_err.c 10.19 (Sleepycat) 11/9/97";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -302,10 +302,13 @@ __db_cgetchk(dbp, key, data, flags, isvalid)
break;
case DB_SET:
break;
- case DB_SET_RECNO:
case DB_GET_RECNO:
if (!F_ISSET(dbp, DB_BT_RECNUM))
goto err;
+ break;
+ case DB_SET_RECNO:
+ if (!F_ISSET(dbp, DB_BT_RECNUM))
+ goto err;
check_key = 1;
break;
default:
@@ -313,8 +316,9 @@ err: return (__db_ferr(dbp->dbenv, "c_get", 0));
}
/* Check for invalid key/data flags. */
- DB_CHECK_FLAGS(dbp->dbenv, "key", key->flags,
- DB_DBT_MALLOC | DB_DBT_USERMEM | DB_DBT_PARTIAL);
+ if (check_key)
+ DB_CHECK_FLAGS(dbp->dbenv, "key", key->flags,
+ DB_DBT_MALLOC | DB_DBT_USERMEM | DB_DBT_PARTIAL);
DB_CHECK_FLAGS(dbp->dbenv, "data", data->flags,
DB_DBT_MALLOC | DB_DBT_USERMEM | DB_DBT_PARTIAL);
diff --git a/db2/common/db_region.c b/db2/common/db_region.c
index 3e8cd2dc66..4fc603a2b0 100644
--- a/db2/common/db_region.c
+++ b/db2/common/db_region.c
@@ -43,7 +43,7 @@
#include "config.h"
#ifndef lint
-static const char sccsid[] = "@(#)db_region.c 10.15 (Sleepycat) 10/25/97";
+static const char sccsid[] = "@(#)db_region.c 10.18 (Sleepycat) 11/28/97";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -80,14 +80,14 @@ static int __db_rmap __P((DB_ENV *, int, size_t, void *));
* into memory, NULL on error.
*
* PUBLIC: int __db_rcreate __P((DB_ENV *, APPNAME,
- * PUBLIC: const char *, const char *, int, size_t, int *, void *));
+ * PUBLIC: const char *, const char *, int, size_t, int, int *, void *));
*/
int
-__db_rcreate(dbenv, appname, path, file, mode, size, fdp, retp)
+__db_rcreate(dbenv, appname, path, file, mode, size, oflags, fdp, retp)
DB_ENV *dbenv;
APPNAME appname;
const char *path, *file;
- int mode, *fdp;
+ int mode, oflags, *fdp;
size_t size;
void *retp;
{
@@ -110,12 +110,13 @@ __db_rcreate(dbenv, appname, path, file, mode, size, fdp, retp)
/*
* Now open the file. We need to make sure that multiple processes
* that attempt to create the region at the same time are properly
- * ordered, so we open it O_EXCL and O_CREAT so two simultaneous
+ * ordered, so we open it DB_EXCL and DB_CREATE so two simultaneous
* attempts to create the region will return failure in one of the
* attempts.
*/
- if (fd == -1 && (ret = __db_open(name,
- DB_CREATE | DB_EXCL, DB_CREATE | DB_EXCL, mode, &fd)) != 0) {
+ oflags |= DB_CREATE | DB_EXCL;
+ if (fd == -1 &&
+ (ret = __db_open(name, oflags, oflags, mode, &fd)) != 0) {
if (ret != EEXIST)
__db_err(dbenv,
"region create: %s: %s", name, strerror(ret));
@@ -398,7 +399,7 @@ __db_runlink(dbenv, appname, path, file, force)
/* If the file doesn't exist, we're done. */
if (__db_exists(name, NULL))
- return (0); /* XXX: ENOENT? */
+ goto done;
/*
* If we're called with a force flag, try and unlink the file. This
@@ -412,8 +413,7 @@ __db_runlink(dbenv, appname, path, file, force)
if (force) {
if ((ret = __db_unlink(name)) != 0 && ret != ENOENT)
goto err1;
- FREES(name);
- return (0);
+ goto done;
}
/* Open and lock the region. */
@@ -453,7 +453,7 @@ __db_runlink(dbenv, appname, path, file, force)
(void)__db_sleep(0, 250000);
}
if (ret == 0) {
- FREES(name);
+done: FREES(name);
return (0);
}
@@ -467,6 +467,7 @@ __db_runlink(dbenv, appname, path, file, force)
err2: (void)__db_mutex_unlock(&rp->lock, fd);
(void)__db_rclose(dbenv, fd, rp);
err1: __db_err(dbenv, "region unlink: %s: %s", name, strerror(ret));
+
FREES(name);
return (ret);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 00:57:40 +0000