GitHub/ish
1
0
Fork 0
mirror of https://github.com/ish-app/ish.git synced 2026-05-28 21:10:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix importing archives with no root entry

Browse Source 
Fixed #808
This commit is contained in:
Theodore Dubois
2020-07-06 16:27:42 -07:00
parent 93ab1bbfaa
commit bee09ce2ed
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/fakefsify.c
+17 -1
View File
@@ -111,9 +111,11 @@ bool fakefs_import(const char *archive_path, const char *fs, struct fakefsify_er
size_t archive_bytes = real_stat.st_size;
sqlite3_stmt *insert_stat = PREPARE("insert into stats (stat) values (?)");
sqlite3_stmt *insert_path = PREPARE("insert or replace into paths values (?, last_insert_rowid())");
sqlite3_stmt *insert_path = PREPARE("insert or replace into paths values (?, ?)");
sqlite3_stmt *insert_hardlink = PREPARE("insert or replace into paths values (?, (select inode from paths where path = ? limit 1))");
bool archive_has_root = false;
// do actual shit
struct archive_entry *entry;
while ((err = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) {
@@ -125,6 +127,8 @@ bool fakefs_import(const char *archive_path, const char *fs, struct fakefsify_er
}
if (!progress_update(&p, (double) archive_filter_bytes(archive, -1) / archive_bytes, entry_path))
CANCEL();
if (strcmp(entry_path, "") == 0)
archive_has_root = true;
const char *hardlink = archive_entry_hardlink(entry);
if (hardlink) {
@@ -148,6 +152,7 @@ bool fakefs_import(const char *archive_path, const char *fs, struct fakefsify_er
char *slash = entry_path_copy;
while ((slash = strchr(slash + 1, '/')) != NULL) {
*slash = '\0';
size_t len = strlen(entry_path_copy);
int err = mkdirat(root_fd, fix_path(entry_path_copy), 0777);
*slash = '/';
if (err < 0) {
@@ -191,11 +196,22 @@ bool fakefs_import(const char *archive_path, const char *fs, struct fakefsify_er
sqlite3_bind_blob64(insert_stat, 1, &stat, sizeof(stat), SQLITE_TRANSIENT);
STEP_RESET(insert_stat);
sqlite3_bind_blob64(insert_path, 1, entry_path, strlen(entry_path), SQLITE_TRANSIENT);
sqlite3_bind_int64(insert_path, 2, sqlite3_last_insert_rowid(db));
STEP_RESET(insert_path);
}
if (err != ARCHIVE_EOF)
ARCHIVE_ERR(archive);
// Add a path entry for the root if it's missing
if (!archive_has_root) {
struct ish_stat stat = {.mode = 0755};
sqlite3_bind_blob64(insert_stat, 1, &stat, sizeof(stat), SQLITE_TRANSIENT);
STEP_RESET(insert_stat);
sqlite3_bind_blob64(insert_path, 1, "", 0, SQLITE_TRANSIENT);
sqlite3_bind_int64(insert_path, 2, sqlite3_last_insert_rowid(db));
STEP_RESET(insert_path);
}
FINALIZE(insert_stat);
FINALIZE(insert_path);
FINALIZE(insert_hardlink);