diff options
author | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2018-02-25 16:41:11 +0000 |
---|---|---|
committer | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2018-02-25 16:41:11 +0000 |
commit | 9b28fcab8819f18426759a4f6193e6333dde3563 (patch) | |
tree | 3862d50f3ac1570461b7c2de412387e16f90af90 | |
parent | 68ed3da63e3133b55e0da6f42f47dcdc974cf6e6 (diff) | |
download | libapr-util-9b28fcab8819f18426759a4f6193e6333dde3563.tar.gz |
Fix error handling in gdbm
Only check for gdbm_errno if the return value of the called gdbm_*
function says so. This fixes apr-util with gdbm 1.14, which does not
seem to always reset gdbm_errno.
Also make the gdbm driver return error codes starting with
APR_OS_START_USEERR instead of always returning APR_EGENERAL. This is
what the berkleydb driver already does.
Also ensure that dsize is 0 if dptr == NULL.
(backport of r1825311 in apr trunk)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/branches/1.6.x@1825312 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | CHANGES | 5 | ||||
-rw-r--r-- | dbm/apr_dbm_gdbm.c | 48 |
2 files changed, 33 insertions, 20 deletions
@@ -1,7 +1,10 @@ -*- coding: utf-8 -*- Changes with APR-util 1.6.2 - + *) apr_dbm_gdbm: Fix handling of error codes. This makes gdbm 1.14 work. + apr_dbm_gdbm will now also return error codes starting with + APR_OS_START_USEERR, as apr_dbm_berkleydb does, instead of always + returning APR_EGENERAL. [Stefan Fritsch] Changes with APR-util 1.6.1 diff --git a/dbm/apr_dbm_gdbm.c b/dbm/apr_dbm_gdbm.c index 749447a0..4d563491 100644 --- a/dbm/apr_dbm_gdbm.c +++ b/dbm/apr_dbm_gdbm.c @@ -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 datum_cleanup(void *dptr) 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 @@ static apr_status_t vt_gdbm_open(apr_dbm_t **pdb, const char *pathname, 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 @@ static apr_status_t vt_gdbm_fetch(apr_dbm_t *dbm, apr_datum_t key, 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 @@ static apr_status_t vt_gdbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey) 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 @@ static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) 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) |