From 92764088a2b09d4e322d21e769ecb51bb5f3b17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Mon, 17 Jun 2013 16:33:59 +0300 Subject: db, cache: do not use cache/tmp for downloads instead use prefix for temporary files. --- src/apk_database.h | 2 +- src/cache.c | 7 +++++-- src/database.c | 44 ++++++++++++++++++++++---------------------- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/apk_database.h b/src/apk_database.h index 48bd5f9bae..0017ade819 100644 --- a/src/apk_database.h +++ b/src/apk_database.h @@ -129,7 +129,7 @@ struct apk_repository_tag { struct apk_database { char *root; - int root_fd, lock_fd, cache_fd, cachetmp_fd, keys_fd, progress_fd; + int root_fd, lock_fd, cache_fd, keys_fd, progress_fd; unsigned num_repos, num_repo_tags; const char *cache_dir; char *cache_remount_dir; diff --git a/src/cache.c b/src/cache.c index d1ce06e9d3..f25f05afd8 100644 --- a/src/cache.c +++ b/src/cache.c @@ -9,6 +9,7 @@ * by the Free Software Foundation. See http://www.gnu.org/ for details. */ +#include #include #include #include @@ -78,8 +79,10 @@ static void cache_clean_item(struct apk_database *db, int dirfd, const char *nam if (apk_verbosity >= 2) apk_message("deleting %s", name); - if (!(apk_flags & APK_SIMULATE)) - unlinkat(dirfd, name, 0); + if (!(apk_flags & APK_SIMULATE)) { + if (unlinkat(dirfd, name, 0) < 0 && errno == EISDIR) + unlinkat(dirfd, name, AT_REMOVEDIR); + } } static int cache_clean(struct apk_database *db) diff --git a/src/database.c b/src/database.c index 199829fbc3..ab129b4dfe 100644 --- a/src/database.c +++ b/src/database.c @@ -46,6 +46,8 @@ enum { int apk_verbosity = 1; unsigned int apk_flags = 0; +static apk_blob_t tmpprefix = { .len=8, .ptr = ".apknew." }; + static const char * const apkindex_tar_gz = "APKINDEX.tar.gz"; static const char * const apk_static_cache_dir = "var/cache/apk"; @@ -624,16 +626,19 @@ int apk_repo_format_item(struct apk_database *db, struct apk_repository *repo, s int apk_cache_download(struct apk_database *db, struct apk_repository *repo, struct apk_package *pkg, int verify) { - char cacheitem[128], url[PATH_MAX]; struct apk_istream *is; struct apk_bstream *bs; struct apk_sign_ctx sctx; + char url[PATH_MAX]; + char tmpcacheitem[128], *cacheitem = &tmpcacheitem[tmpprefix.len]; + apk_blob_t b = APK_BLOB_BUF(tmpcacheitem); int r, fd; + apk_blob_push_blob(&b, tmpprefix); if (pkg != NULL) - r = apk_pkg_format_cache_pkg(APK_BLOB_BUF(cacheitem), pkg); + r = apk_pkg_format_cache_pkg(b, pkg); else - r = apk_repo_format_cache_index(APK_BLOB_BUF(cacheitem), repo); + r = apk_repo_format_cache_index(b, repo); if (r < 0) return r; @@ -649,13 +654,13 @@ int apk_cache_download(struct apk_database *db, struct apk_repository *repo, if (verify != APK_SIGN_NONE) { apk_sign_ctx_init(&sctx, APK_SIGN_VERIFY, NULL, db->keys_fd); bs = apk_bstream_from_url(url); - bs = apk_bstream_tee(bs, db->cachetmp_fd, cacheitem); + bs = apk_bstream_tee(bs, db->cache_fd, tmpcacheitem); is = apk_bstream_gunzip_mpart(bs, apk_sign_ctx_mpart_cb, &sctx); r = apk_tar_parse(is, apk_sign_ctx_verify_tar, &sctx, FALSE, &db->id_cache); apk_sign_ctx_free(&sctx); } else { is = apk_istream_from_url(url); - fd = openat(db->cachetmp_fd, cacheitem, O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC, 0644); + fd = openat(db->cache_fd, tmpcacheitem, O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC, 0644); if (fd >= 0) { r = apk_istream_splice(is, fd, APK_SPLICE_ALL, NULL, NULL); close(fd); @@ -665,14 +670,12 @@ int apk_cache_download(struct apk_database *db, struct apk_repository *repo, } is->close(is); if (r < 0) { - unlinkat(db->cachetmp_fd, cacheitem, 0); + unlinkat(db->cache_fd, tmpcacheitem, 0); return r; } - if (db->cachetmp_fd != db->cache_fd) { - if (renameat(db->cachetmp_fd, cacheitem, db->cache_fd, cacheitem) < 0) - return -errno; - } + if (renameat(db->cache_fd, tmpcacheitem, db->cache_fd, cacheitem) < 0) + return -errno; return 0; } @@ -1445,6 +1448,7 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) struct apk_repository_list *repo = NULL; struct apk_bstream *bs; struct statfs stfs; + struct statvfs stvfs; apk_blob_t blob; int r, fd, write_arch = FALSE; @@ -1553,8 +1557,6 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) /* figure out where to have the cache */ fd = openat(db->root_fd, apk_linked_cache_dir, O_RDONLY | O_CLOEXEC); if (fd >= 0 && fstatfs(fd, &stfs) == 0 && stfs.f_type != 0x01021994 /* TMPFS_MAGIC */) { - struct statvfs stvfs; - db->cache_dir = apk_linked_cache_dir; db->cache_fd = fd; if ((dbopts->open_flags & (APK_OPENF_WRITE | APK_OPENF_CACHE_WRITE)) && @@ -1571,14 +1573,11 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) goto ret_r; } } - mkdirat(db->cache_fd, "tmp", 0644); - db->cachetmp_fd = openat(db->cache_fd, "tmp", O_RDONLY | O_CLOEXEC); } else { if (fd >= 0) close(fd); db->cache_dir = apk_static_cache_dir; db->cache_fd = openat(db->root_fd, db->cache_dir, O_RDONLY | O_CLOEXEC); - db->cachetmp_fd = db->cache_fd; } db->keys_fd = openat(db->root_fd, @@ -1757,8 +1756,6 @@ void apk_db_close(struct apk_database *db) if (db->keys_fd) close(db->keys_fd); - if (db->cachetmp_fd && db->cachetmp_fd != db->cache_fd) - close(db->cachetmp_fd); if (db->cache_fd) close(db->cache_fd); if (db->root_fd) @@ -2540,7 +2537,8 @@ static int apk_db_unpack_pkg(struct apk_database *db, struct apk_repository *repo; struct apk_package *pkg = ipkg->pkg; const char *action = ""; - char file[PATH_MAX], item[128]; + char file[PATH_MAX]; + char tmpcacheitem[128], *cacheitem = &tmpcacheitem[tmpprefix.len]; int r, filefd = AT_FDCWD, need_copy = FALSE; if (pkg->filename == NULL) { @@ -2568,8 +2566,10 @@ static int apk_db_unpack_pkg(struct apk_database *db, goto err_msg; } if (need_copy) { - apk_pkg_format_cache_pkg(APK_BLOB_BUF(item), pkg); - bs = apk_bstream_tee(bs, db->cachetmp_fd, item); + apk_blob_t b = APK_BLOB_BUF(tmpcacheitem); + apk_blob_push_blob(&b, tmpprefix); + apk_pkg_format_cache_pkg(b, pkg); + bs = apk_bstream_tee(bs, db->cache_fd, tmpcacheitem); if (bs == NULL) { action = "unable cache package: "; r = -errno; @@ -2595,10 +2595,10 @@ static int apk_db_unpack_pkg(struct apk_database *db, if (need_copy) { if (r == 0) { - renameat(db->cachetmp_fd, item, db->cache_fd, item); + renameat(db->cache_fd, tmpcacheitem, db->cache_fd, cacheitem); pkg->repos |= BIT(APK_REPOSITORY_CACHED); } else { - unlinkat(db->cachetmp_fd, item, 0); + unlinkat(db->cache_fd, tmpcacheitem, 0); } } if (r != 0) -- cgit v1.2.3