From 082bc288ff27d74ae48b78d994eec2a4f0106cd2 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Tue, 7 Nov 2000 22:25:34 +0000 Subject: Build e-dbhash.[hc] 2000-11-07 JP Rosevear * Makefile.am: Build e-dbhash.[hc] * e-dbhash.[hc]: New routines to manage a db database on disk that contains md5 hashed data and indexed by uids. Provides comparison functions and such so the caller does not have to do the md5 bits. 2000-11-07 JP Rosevear * backend/pas/pas-book.h: Update PASRequest structure * backend/pas/pas-book.c (impl_Evolution_Book_get_changes): update param name (pas_book_queue_get_changes): Use PASRequest change_id slot * backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): Properly copy change_id and change_context (pas_backend_file_book_view_free): Free change_id/change_context (pas_backend_file_changes_foreach_key): Callback to figure out the deleted cards (pas_backend_file_changes): Use new e-dbhash stuff to implement. Write out updated hash * backend/idl/addressbook.idl: Rename get_changes param svn path=/trunk/; revision=6489 --- e-util/ChangeLog | 8 +++ e-util/Makefile.am | 2 + e-util/e-dbhash.c | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++++ e-util/e-dbhash.h | 45 +++++++++++++ 4 files changed, 249 insertions(+) create mode 100644 e-util/e-dbhash.c create mode 100644 e-util/e-dbhash.h (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 9cad1815d6..f30bfe7724 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,11 @@ +2000-11-07 JP Rosevear + + * Makefile.am: Build e-dbhash.[hc] + + * e-dbhash.[hc]: New routines to manage a db database on disk that + contains md5 hashed data and indexed by uids. Provides comparison + functions and such so the caller does not have to do the md5 bits. + 200-10-30 Kjartan Maraas * e-dialog-widgets.c: #include to quench warning. diff --git a/e-util/Makefile.am b/e-util/Makefile.am index a2c25b0501..856cecf46a 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -31,6 +31,8 @@ libeutil_la_SOURCES = \ e-list.h \ e-sexp.c \ e-sexp.h \ + e-dbhash.c \ + e-dbhash.h \ md5-utils.c \ md5-utils.h diff --git a/e-util/e-dbhash.c b/e-util/e-dbhash.c new file mode 100644 index 0000000000..57cf8ff9c1 --- /dev/null +++ b/e-util/e-dbhash.c @@ -0,0 +1,194 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Author: + * JP Rosevear (jpr@helixcode.com) + * + * Copyright 2000, Helix Code, Inc. + */ + +#include +#include +#include +#ifdef HAVE_DB_185_H +#include +#else +#ifdef HAVE_DB1_DB_H +#include +#else +#include +#endif +#endif +#include "md5-utils.h" +#include "e-dbhash.h" + +struct _EDbHashPrivate +{ + DB *db; +}; + +EDbHash * +e_dbhash_new (const char *filename) +{ + EDbHash *edbh; + DB *db; + + /* Attempt to open the database */ + db = dbopen (filename, O_RDWR, 0666, DB_HASH, NULL); + if (db == NULL) { + db = dbopen (filename, O_RDWR | O_CREAT, 0666, DB_HASH, NULL); + + if (db == NULL) + return NULL; + } + + edbh = g_new (EDbHash, 1); + edbh->priv = g_new (EDbHashPrivate, 1); + edbh->priv->db = db; + + return edbh; +} + +static void +string_to_dbt(const char *str, DBT *dbt) +{ + dbt->data = (void*)str; + dbt->size = strlen (str) + 1; +} + +void +e_dbhash_add (EDbHash *edbh, const gchar *key, const gchar *data) +{ + DB *db; + DBT dkey; + DBT ddata; + guchar local_hash[16]; + + g_return_if_fail (edbh != NULL); + g_return_if_fail (edbh->priv != NULL); + g_return_if_fail (edbh->priv->db != NULL); + g_return_if_fail (key != NULL); + g_return_if_fail (data != NULL); + + db = edbh->priv->db; + + /* Key dbt */ + string_to_dbt (key, &dkey); + + /* Data dbt */ + md5_get_digest (data, strlen (data), local_hash); + string_to_dbt (local_hash, &ddata); + + /* Add to database */ + db->put (db, &dkey, &ddata, 0); + + g_free (local_hash); +} + +void +e_dbhash_remove (EDbHash *edbh, const char *key) +{ + DB *db; + DBT dkey; + + g_return_if_fail (edbh != NULL); + g_return_if_fail (edbh->priv != NULL); + g_return_if_fail (key != NULL); + + db = edbh->priv->db; + + /* Key dbt */ + string_to_dbt (key, &dkey); + + /* Remove from database */ + db->del (db, &dkey, 0); +} + +void +e_dbhash_foreach_key (EDbHash *edbh, EDbHashFunc *func, gpointer user_data) +{ + DB *db; + DBT dkey; + DBT ddata; + int db_error = 0; + + g_return_if_fail (edbh != NULL); + g_return_if_fail (edbh->priv != NULL); + g_return_if_fail (func != NULL); + + db = edbh->priv->db; + + db_error = db->seq(db, &dkey, &ddata, R_FIRST); + + while (db_error == 0) { + (*func) ((const char *)dkey.data, user_data); + + db_error = db->seq(db, &dkey, &ddata, R_NEXT); + } +} + +EDbHashStatus +e_dbhash_compare (EDbHash *edbh, const char *key, const char *compare_data) +{ + DB *db; + DBT dkey; + DBT ddata; + guchar compare_hash[16]; + + g_return_val_if_fail (edbh != NULL, FALSE); + g_return_val_if_fail (edbh->priv != NULL, FALSE); + g_return_val_if_fail (key != NULL, FALSE); + g_return_val_if_fail (compare_hash != NULL, FALSE); + + db = edbh->priv->db; + + /* Key dbt */ + string_to_dbt (key, &dkey); + + /* Lookup in database */ + db->get (db, &dkey, &ddata, 0); + + /* Compare */ + if (ddata.data) { + md5_get_digest (compare_data, strlen (compare_data), compare_hash); + + if (memcmp (ddata.data, compare_hash, sizeof (guchar) * 16)) + return E_DBHASH_STATUS_DIFFERENT; + } else { + return E_DBHASH_STATUS_NOT_FOUND; + } + + return E_DBHASH_STATUS_SAME; +} + +void +e_dbhash_write (EDbHash *edbh) +{ + DB *db; + + g_return_if_fail (edbh != NULL); + g_return_if_fail (edbh->priv != NULL); + + db = edbh->priv->db; + + /* Flush database to disk */ + db->sync (db, 0); +} + +void +e_dbhash_destroy (EDbHash *edbh) +{ + DB *db; + + g_return_if_fail (edbh != NULL); + g_return_if_fail (edbh->priv != NULL); + + db = edbh->priv->db; + + /* Close datbase */ + db->close (db); + + g_free (edbh->priv); + g_free (edbh); +} + + diff --git a/e-util/e-dbhash.h b/e-util/e-dbhash.h new file mode 100644 index 0000000000..11fcdceb80 --- /dev/null +++ b/e-util/e-dbhash.h @@ -0,0 +1,45 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Writes hashes that go to/from disk in db form. Hash keys are strings + * + * Author: + * JP Rosevear (jpr@helixcode.com) + * + * Copyright 2000, Helix Code, Inc. + */ + +#ifndef __E_DBHASH_H__ +#define __E_DBHASH_H__ + +#include + +typedef enum { + E_DBHASH_STATUS_SAME, + E_DBHASH_STATUS_DIFFERENT, + E_DBHASH_STATUS_NOT_FOUND, +} EDbHashStatus; + +typedef struct _EDbHash EDbHash; +typedef struct _EDbHashPrivate EDbHashPrivate; + +struct _EDbHash +{ + EDbHashPrivate *priv; +}; + +typedef void (*EDbHashFunc) (const char *key, gpointer user_data); + +EDbHash *e_dbhash_new (const char *filename); + +void e_dbhash_add (EDbHash *edbh, const char *key, const char *data); +void e_dbhash_remove (EDbHash *edbh, const char *key); + +EDbHashStatus e_dbhash_compare (EDbHash *edbh, const char *key, const char *compare_data); +void e_dbhash_foreach_key (EDbHash *edbh, EDbHashFunc *func, gpointer user_data); + +void e_dbhash_write (EDbHash *edbh); + +void e_dbhash_destroy (EDbHash *edbh); + +#endif /* ! __E_DBHASH_H__ */ + -- cgit v1.2.3