/*
* cdb, cdb-wr - Tcl bindings for tinycdb and a journalling write extension
- * Copyright 2006 Ian Jackson
+ * Copyright 2006-2012 Ian Jackson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "chiark_tcl_cdb.h"
static HashValue *htv_prep(int len) {
HashValue *hd;
- hd= TALLOC((hd->data - (Byte*)hd) + len);
+ hd= TALLOC(offsetof(typeof(*hd), data) + len);
hd->len= len;
return hd;
}
ScriptToInvoke on_info, on_lexminval;
} Rw;
+static void rw_cdb_close(Tcl_Interp *ip, Rw *rw) {
+ if (rw->cdb_fd >= 0) cdb_free(&rw->cdb);
+ maybe_close(rw->cdb_fd);
+}
+
static int rw_close(Tcl_Interp *ip, Rw *rw) {
int rc, r;
rc= TCL_OK;
ht_destroy(&rw->logincore);
- if (rw->cdb_fd >= 0) cdb_free(&rw->cdb);
- maybe_close(rw->cdb_fd);
+ rw_cdb_close(ip,rw);
maybe_close(rw->lock_fd);
if (rw->logfile) {
/*---------- Opening ----------*/
static int cdbinit(Tcl_Interp *ip, Rw *rw) {
- /* On entry, cdb_fd >=0 but cdb is _undefined_/
+ /* On entry, cdb_fd >=0 but cdb is _undefined_
* On exit, either cdb_fd<0 or cdb is initialised */
int r, rc;
rc= compact_core(ip, rw, logsz, &reccount); if (rc) goto x_rc;
- maybe_close(rw->cdb_fd);
- rw->cdb_fd= -1;
+ rw_cdb_close(ip,rw);
ht_destroy(&rw->logincore);
ht_setup(&rw->logincore);
val= ht_lookup(&rw->logincore, key);
if (val) {
if (val->len) { *data_r= val->data; *len_r= val->len; return TCL_OK; }
- else { *data_r= 0; *len_r= -1; return TCL_OK; }
+ else goto not_found;
}
+ if (rw->cdb_fd<0) goto not_found;
+
return cht_cdb_lookup_cdb(ip, &rw->cdb, key, strlen(key), data_r, len_r);
-}
+
+ not_found:
+ *data_r= 0;
+ *len_r= -1;
+ return TCL_OK;
+}
int cht_do_cdbwr_lookup(ClientData cd, Tcl_Interp *ip, void *rw_v,
const char *key, Tcl_Obj *def,