diff options
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/be_sync.c | 12 | ||||
| -rw-r--r-- | lib/libalpm/diskspace.c | 15 | ||||
| -rw-r--r-- | lib/libalpm/util.h | 1 |
3 files changed, 25 insertions, 3 deletions
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 6c0d2d67..98516fd8 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -84,6 +84,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) struct stat buf; size_t len; int ret; + mode_t oldmask; ALPM_LOG_FUNC; @@ -104,6 +105,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) MALLOC(syncpath, len, RET_ERR(PM_ERR_MEMORY, -1)); sprintf(syncpath, "%s%s", dbpath, "sync/"); + /* make sure we have a sane umask */ + oldmask = umask(0022); + if(stat(syncpath, &buf) != 0) { _alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", syncpath); @@ -124,6 +128,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) ret = _alpm_download_single_file(dbfile, db->servers, syncpath, force); free(dbfile); free(syncpath); + umask(oldmask); if(ret == 1) { /* files match, do nothing */ @@ -429,7 +434,12 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, } else if(strcmp(line, "%PROVIDES%") == 0) { READ_AND_STORE_ALL(pkg->provides); } else if(strcmp(line, "%DELTAS%") == 0) { - READ_AND_STORE_ALL(pkg->deltas); + /* Different than the rest because of the _alpm_delta_parse call. */ + while(1) { + READ_NEXT(line); + if(strlen(line) == 0) break; + pkg->deltas = alpm_list_add(pkg->deltas, _alpm_delta_parse(line)); + } } } } else if(strcmp(filename, "files") == 0) { diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 892b1aac..281173a2 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -61,7 +61,7 @@ static int mount_point_cmp(const void *p1, const void *p2) static alpm_list_t *mount_point_list(void) { - alpm_list_t *mount_points = NULL; + alpm_list_t *mount_points = NULL, *ptr; alpm_mountpoint_t *mp; #if defined HAVE_GETMNTENT @@ -124,6 +124,10 @@ static alpm_list_t *mount_point_list(void) mount_points = alpm_list_msort(mount_points, alpm_list_count(mount_points), mount_point_cmp); + for(ptr = mount_points; ptr != NULL; ptr = ptr->next) { + mp = ptr->data; + _alpm_log(PM_LOG_DEBUG, "mountpoint: %s\n", mp->mount_dir); + } return(mount_points); } @@ -256,6 +260,7 @@ cleanup: int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) { alpm_list_t *mount_points, *i; + alpm_mountpoint_t *root_mp; size_t replaces = 0, current = 0, numtargs; int abort = 0; alpm_list_t *targ; @@ -263,7 +268,13 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) numtargs = alpm_list_count(trans->add); mount_points = mount_point_list(); if(mount_points == NULL) { - _alpm_log(PM_LOG_ERROR, _("could not determine filesystem mount points")); + _alpm_log(PM_LOG_ERROR, _("could not determine filesystem mount points\n")); + return(-1); + } + root_mp = match_mount_point(mount_points, handle->root); + if(root_mp == NULL) { + _alpm_log(PM_LOG_ERROR, _("could not determine root mount point %s\n"), + handle->root); return(-1); } diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index d65f7734..3232f004 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -32,6 +32,7 @@ #include <stdio.h> #include <string.h> #include <stdarg.h> +#include <stddef.h> /* size_t */ #include <time.h> #include <sys/stat.h> /* struct stat */ #include <archive.h> /* struct archive */ |