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

alpm_db_update(): refactor out sync dir create/check

Browse Source 
This was a lot of stuff that can stand by itself for the most part.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-06-07 21:39:12 -05:00
parent a775530941
commit f6700d5c98
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/libalpm/be_sync.c
View File

@ -37,6 +37,34 @@
#include "deps.h" #include "deps.h"
#include "dload.h" #include "dload.h"
static char *get_sync_dir(pmhandle_t *handle)
{
const char *dbpath = alpm_option_get_dbpath(handle);
size_t len = strlen(dbpath) + 6;
char *syncpath;
struct stat buf;
MALLOC(syncpath, len, RET_ERR(handle, PM_ERR_MEMORY, NULL));
sprintf(syncpath, "%s%s", dbpath, "sync/");
if(stat(syncpath, &buf) != 0) {
_alpm_log(handle, PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n",
syncpath);
if(_alpm_makepath(syncpath) != 0) {
free(syncpath);
RET_ERR(handle, PM_ERR_SYSTEM, NULL);
}
} else if(!S_ISDIR(buf.st_mode)) {
_alpm_log(handle, PM_LOG_WARNING, _("removing invalid file: %s\n"), syncpath);
if(unlink(syncpath) != 0 || _alpm_makepath(syncpath) != 0) {
free(syncpath);
RET_ERR(handle, PM_ERR_SYSTEM, NULL);
}
}
return syncpath;
}
/** Update a package database /** Update a package database
* *
* An update of the package database \a db will be attempted. Unless * An update of the package database \a db will be attempted. Unless
@ -79,10 +107,7 @@
int SYMEXPORT alpm_db_update(int force, pmdb_t *db) int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
{ {
char *syncpath; char *syncpath;
const char *dbpath;
alpm_list_t *i; alpm_list_t *i;
struct stat buf;
size_t len;
int ret = -1; int ret = -1;
mode_t oldmask; mode_t oldmask;
pmhandle_t *handle; pmhandle_t *handle;
@ -94,29 +119,13 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
ASSERT(db != handle->db_local, RET_ERR(handle, PM_ERR_WRONG_ARGS, -1)); ASSERT(db != handle->db_local, RET_ERR(handle, PM_ERR_WRONG_ARGS, -1));
ASSERT(db->servers != NULL, RET_ERR(handle, PM_ERR_SERVER_NONE, -1)); ASSERT(db->servers != NULL, RET_ERR(handle, PM_ERR_SERVER_NONE, -1));
dbpath = alpm_option_get_dbpath(handle);
len = strlen(dbpath) + 6;
MALLOC(syncpath, len, RET_ERR(handle, PM_ERR_MEMORY, -1));
sprintf(syncpath, "%s%s", dbpath, "sync/");
/* make sure we have a sane umask */ /* make sure we have a sane umask */
oldmask = umask(0022); oldmask = umask(0022);
if(stat(syncpath, &buf) != 0) { syncpath = get_sync_dir(handle);
_alpm_log(handle, PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", if(!syncpath) {
syncpath); return -1;
if(_alpm_makepath(syncpath) != 0) {
free(syncpath);
RET_ERR(handle, PM_ERR_SYSTEM, -1);
}
} else if(!S_ISDIR(buf.st_mode)) {
_alpm_log(handle, PM_LOG_WARNING, _("removing invalid file: %s\n"), syncpath);
if(unlink(syncpath) != 0 || _alpm_makepath(syncpath) != 0) {
free(syncpath);
RET_ERR(handle, PM_ERR_SYSTEM, -1);
}
} }
check_sig = _alpm_db_get_sigverify_level(db); check_sig = _alpm_db_get_sigverify_level(db);
for(i = db->servers; i; i = i->next) { for(i = db->servers; i; i = i->next) {