moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-08 12:28:00 -05:00
Code Issues Releases Wiki Activity

libalpm/db.c : add alpm_db_unregister_all.

Browse Source 
This basically moves the code from alpm_release, which was mostly about
unregistering all databases, to a safer alpm_db_unregister_all.
This allows to avoid modifying the dbs_sync list while iterating over it,
and and also prevent alpm_release from looping infinitely when a database
can't be unregistered.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
This commit is contained in:
Chantry Xavier 2007-07-09 17:02:29 +02:00 committed by Dan McGee
parent 47cada81a0
commit ee977019e3
4 changed files with 56 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libalpm/alpm.c
View File

@ -62,24 +62,12 @@ int SYMEXPORT alpm_initialize(void)
*/
int SYMEXPORT alpm_release(void)
{
int dbs_left = 0;
ALPM_LOG_FUNC;
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
/* close local database */
if(handle->db_local) {
alpm_db_unregister(handle->db_local);
handle->db_local = NULL;
}
/* and also sync ones */
while((dbs_left = alpm_list_count(handle->dbs_sync)) > 0) {
pmdb_t *db = (pmdb_t *)handle->dbs_sync->data;
_alpm_log(PM_LOG_DEBUG, "removing DB %s, %d remaining...",
db->treename, dbs_left);
alpm_db_unregister(db);
db = NULL;
if(alpm_db_unregister_all() == -1) {
return(-1);
}
_alpm_handle_free(handle);

1
lib/libalpm/alpm.h
View File

@ -145,6 +145,7 @@ alpm_list_t *alpm_option_get_syncdbs();
pmdb_t *alpm_db_register(const char *treename);
int alpm_db_unregister(pmdb_t *db);
int alpm_db_unregister_all();
const char *alpm_db_get_name(const pmdb_t *db);
const char *alpm_db_get_url(const pmdb_t *db);

63
lib/libalpm/db.c
View File

@ -70,6 +70,35 @@ pmdb_t SYMEXPORT *alpm_db_register(const char *treename)
return(_alpm_db_register(treename));
}
/** Unregister all package databases
* @return 0 on success, -1 on error (pm_errno is set accordingly)
*/
int SYMEXPORT alpm_db_unregister_all()
{
alpm_list_t *i;
ALPM_LOG_FUNC;
/* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
/* Do not unregister a database if a transaction is on-going */
ASSERT(handle->trans == NULL || handle->trans->state == STATE_INTERRUPTED,
RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
/* close local database */
_alpm_db_unregister(handle->db_local);
handle->db_local = NULL;
/* and also sync ones */
for(i = handle->dbs_sync; i; i = i->next) {
pmdb_t *db = i->data;
_alpm_db_unregister(db);
i->data = NULL;
}
FREELIST(handle->dbs_sync);
return(0);
}
/** Unregister a package database
* @param db pointer to the package database to unregister
* @return 0 on success, -1 on error (pm_errno is set accordingly)
@ -84,13 +113,17 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db)
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
ASSERT(db != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
/* Do not unregister a database if a transaction is on-going */
ASSERT(handle->trans == NULL || handle->trans->state == STATE_INTERRUPTED,
ASSERT(handle->trans == NULL || handle->trans->state == STATE_INTERRUPTED,
RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
if(db == handle->db_local) {
handle->db_local = NULL;
found = 1;
} else {
/* Warning : this function shouldn't be used to unregister all sync databases
* by walking through the list returned by alpm_option_get_syncdbs,
* because the db is removed from that list here.
*/
void *data;
handle->dbs_sync = alpm_list_remove(handle->dbs_sync, db, _alpm_db_cmp, &data);
if(data) {
@ -102,16 +135,7 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db)
RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
}
_alpm_log(PM_LOG_DEBUG, "unregistering database '%s'", db->treename);
/* Cleanup */
_alpm_db_free_pkgcache(db);
_alpm_log(PM_LOG_DEBUG, "closing database '%s'", db->treename);
_alpm_db_close(db);
_alpm_db_free(db);
_alpm_db_unregister(db);
return(0);
}
@ -542,6 +566,23 @@ error:
/** @} */
/* Helper function for alpm_db_unregister{_all} */
void _alpm_db_unregister(pmdb_t *db)
{
if(db == NULL) {
return;
}
_alpm_log(PM_LOG_DEBUG, "unregistering database '%s'", db->treename);
/* Cleanup */
_alpm_db_free_pkgcache(db);
_alpm_log(PM_LOG_DEBUG, "closing database '%s'", db->treename);
_alpm_db_close(db);
_alpm_db_free(db);
}
pmdb_t *_alpm_db_new(const char *dbpath, const char *treename)
{
pmdb_t *db;

1
lib/libalpm/db.h
View File

@ -53,6 +53,7 @@ void _alpm_db_free(pmdb_t *db);
int _alpm_db_cmp(const void *db1, const void *db2);
alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles);
pmdb_t *_alpm_db_register(const char *treename);
void _alpm_db_unregister(pmdb_t *db);
/* be.c, backend specific calls */
int _alpm_db_install(pmdb_t *db, const char *dbfile);