From 407ef801d9b10b535e13fa26f12396b0476dd825 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 24 Nov 2009 08:18:58 +0000 Subject: db: check if target exist before renaming tempfile do not overwrite target if we have --never-overwrite and target exists. ref #197 --- src/database.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/database.c b/src/database.c index 5b1d6bb..f06eba4 100644 --- a/src/database.c +++ b/src/database.c @@ -1890,9 +1890,16 @@ static void apk_db_migrate_files(struct apk_database *db, apk_checksum_compare(&file->csum, &fi.csum) == 0)) unlinkat(db->root_fd, tmpname, 0); } else { - /* Overwrite the old file */ - renameat(db->root_fd, tmpname, - db->root_fd, name); + /* check if want keep existing files */ + if ((apk_flags & APK_NEVER_OVERWRITE) && + (faccessat(db->root_fd, name, F_OK, + AT_SYMLINK_NOFOLLOW) == 0)) { + unlinkat(db->root_fd, tmpname, 0); + } else { + /* Overwrite the old file */ + renameat(db->root_fd, tmpname, + db->root_fd, name); + } } /* Claim ownership of the file in db */ -- cgit v1.2.3