jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

db: do not assume root ends with '/'

cute-signatures
Natanael Copa 2009-04-21 08:51:18 +00:00
parent 64e0adf0c7
commit 74b5e4f535
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/database.c
View File

@ -906,7 +906,7 @@ static struct apk_bstream *apk_db_cache_open(struct apk_database *db,
if (db->root == NULL) if (db->root == NULL)
return NULL; return NULL;
snprintf(tmp, sizeof(tmp), "%svar/lib/apk/%s", db->root, file); snprintf(tmp, sizeof(tmp), "%s/var/lib/apk/%s", db->root, file);
return apk_bstream_from_file(tmp); return apk_bstream_from_file(tmp);
} }
@ -919,7 +919,7 @@ static int apk_db_cache_has(struct apk_database *db, const char *file)
if (db->root == NULL) if (db->root == NULL)
return FALSE; return FALSE;
snprintf(tmp, sizeof(tmp), "%svar/lib/apk/%s", db->root, file); snprintf(tmp, sizeof(tmp), "%s/var/lib/apk/%s", db->root, file);
r = apk_file_get_info(tmp, &fi); r = apk_file_get_info(tmp, &fi);
if (r < 0) if (r < 0)
return FALSE; return FALSE;
@ -948,13 +948,13 @@ int apk_repository_update(struct apk_database *db, struct apk_repository *repo)
apk_message("fetch index %s", repo->url); apk_message("fetch index %s", repo->url);
snprintf(tmp, sizeof(tmp), "%s/APK_INDEX.gz", repo->url); snprintf(tmp, sizeof(tmp), "%s/APK_INDEX.gz", repo->url);
snprintf(tmp2, sizeof(tmp2), "%svar/lib/apk/%s.new", snprintf(tmp2, sizeof(tmp2), "%s/var/lib/apk/%s.new",
db->root, repo->cache); db->root, repo->cache);
r = apk_url_download(tmp, tmp2); r = apk_url_download(tmp, tmp2);
if (r < 0) if (r < 0)
return r; return r;
snprintf(tmp, sizeof(tmp), "%svar/lib/apk/%s", snprintf(tmp, sizeof(tmp), "%s/var/lib/apk/%s",
db->root, repo->cache); db->root, repo->cache);
if (rename(tmp2, tmp) < 0) if (rename(tmp2, tmp) < 0)
return -errno; return -errno;