104 lines
3.1 KiB
Diff
104 lines
3.1 KiB
Diff
|
--- 1.6.x/dbm/apr_dbm_gdbm.c 2018/02/25 16:36:31 1825311
|
||
|
|
+++ 1.6.x/dbm/apr_dbm_gdbm.c 2018/02/25 16:41:11 1825312
|
||
|
|
@@ -36,8 +36,20 @@
|
||
|
|
static apr_status_t g2s(int gerr)
|
||
|
|
{
|
||
|
|
if (gerr == -1) {
|
||
|
|
- /* ### need to fix this */
|
||
|
|
- return APR_EGENERAL;
|
||
|
|
+ if (gdbm_errno == GDBM_NO_ERROR)
|
||
|
|
+ return APR_SUCCESS;
|
||
|
|
+ return APR_OS_START_USEERR + gdbm_errno;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return APR_SUCCESS;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+static apr_status_t gdat2s(datum d)
|
||
|
|
+{
|
||
|
|
+ if (d.dptr == NULL) {
|
||
|
|
+ if (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND)
|
||
|
|
+ return APR_SUCCESS;
|
||
|
|
+ return APR_OS_START_USEERR + gdbm_errno;
|
||
|
|
}
|
||
|
|
|
||
|
|
return APR_SUCCESS;
|
||
|
|
@@ -53,22 +65,14 @@
|
||
|
|
|
||
|
|
static apr_status_t set_error(apr_dbm_t *dbm, apr_status_t dbm_said)
|
||
|
|
{
|
||
|
|
- apr_status_t rv = APR_SUCCESS;
|
||
|
|
-
|
||
|
|
- /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */
|
||
|
|
+ dbm->errcode = dbm_said;
|
||
|
|
|
||
|
|
- if ((dbm->errcode = gdbm_errno) == GDBM_NO_ERROR) {
|
||
|
|
+ if (dbm_said == APR_SUCCESS)
|
||
|
|
dbm->errmsg = NULL;
|
||
|
|
- }
|
||
|
|
- else {
|
||
|
|
- dbm->errmsg = gdbm_strerror(gdbm_errno);
|
||
|
|
- rv = APR_EGENERAL; /* ### need something better */
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- /* captured it. clear it now. */
|
||
|
|
- gdbm_errno = GDBM_NO_ERROR;
|
||
|
|
+ else
|
||
|
|
+ dbm->errmsg = gdbm_strerror(dbm_said - APR_OS_START_USEERR);
|
||
|
|
|
||
|
|
- return rv;
|
||
|
|
+ return dbm_said;
|
||
|
|
}
|
||
|
|
|
||
|
|
/* --------------------------------------------------------------------------
|
||
|
|
@@ -107,7 +111,7 @@
|
||
|
|
NULL);
|
||
|
|
|
||
|
|
if (file == NULL)
|
||
|
|
- return APR_EGENERAL; /* ### need a better error */
|
||
|
|
+ return APR_OS_START_USEERR + gdbm_errno;
|
||
|
|
|
||
|
|
/* we have an open database... return it */
|
||
|
|
*pdb = apr_pcalloc(pool, sizeof(**pdb));
|
||
|
|
@@ -141,10 +145,12 @@
|
||
|
|
if (pvalue->dptr)
|
||
|
|
apr_pool_cleanup_register(dbm->pool, pvalue->dptr, datum_cleanup,
|
||
|
|
apr_pool_cleanup_null);
|
||
|
|
+ else
|
||
|
|
+ pvalue->dsize = 0;
|
||
|
|
|
||
|
|
/* store the error info into DBM, and return a status code. Also, note
|
||
|
|
that *pvalue should have been cleared on error. */
|
||
|
|
- return set_error(dbm, APR_SUCCESS);
|
||
|
|
+ return set_error(dbm, gdat2s(rd));
|
||
|
|
}
|
||
|
|
|
||
|
|
static apr_status_t vt_gdbm_store(apr_dbm_t *dbm, apr_datum_t key,
|
||
|
|
@@ -201,9 +207,11 @@
|
||
|
|
if (pkey->dptr)
|
||
|
|
apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup,
|
||
|
|
apr_pool_cleanup_null);
|
||
|
|
+ else
|
||
|
|
+ pkey->dsize = 0;
|
||
|
|
|
||
|
|
/* store any error info into DBM, and return a status code. */
|
||
|
|
- return set_error(dbm, APR_SUCCESS);
|
||
|
|
+ return set_error(dbm, gdat2s(rd));
|
||
|
|
}
|
||
|
|
|
||
|
|
static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
|
||
|
|
@@ -221,9 +229,11 @@
|
||
|
|
if (pkey->dptr)
|
||
|
|
apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup,
|
||
|
|
apr_pool_cleanup_null);
|
||
|
|
+ else
|
||
|
|
+ pkey->dsize = 0;
|
||
|
|
|
||
|
|
/* store any error info into DBM, and return a status code. */
|
||
|
|
- return set_error(dbm, APR_SUCCESS);
|
||
|
|
+ return set_error(dbm, gdat2s(rd));
|
||
|
|
}
|
||
|
|
|
||
|
|
static void vt_gdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data)
|
||
|
|
|