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

src/database.c: get repository file from environment variable APK_REPOS 

Defaults to /etc/apk/repositories, absolute path and not relative
the install root.
cute-signatures
Natanael Copa 2009-01-08 07:15:16 +00:00
parent d704e93f8d
commit 174dd41113
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/database.c
View File

@ -16,6 +16,7 @@
#include <unistd.h> #include <unistd.h>
#include <malloc.h> #include <malloc.h>
#include <string.h> #include <string.h>
#include <stdlib.h>
#include "apk_defines.h" #include "apk_defines.h"
#include "apk_package.h" #include "apk_package.h"
@ -576,6 +577,7 @@ static int add_protected_path(void *ctx, apk_blob_t blob)
int apk_db_open(struct apk_database *db, const char *root) int apk_db_open(struct apk_database *db, const char *root)
{ {
apk_blob_t blob; apk_blob_t blob;
const char *apk_repos = getenv("APK_REPOS");
memset(db, 0, sizeof(*db)); memset(db, 0, sizeof(*db));
apk_hash_init(&db->available.names, &pkg_name_hash_ops, 1000); apk_hash_init(&db->available.names, &pkg_name_hash_ops, 1000);
@ -599,8 +601,9 @@ int apk_db_open(struct apk_database *db, const char *root)
if (apk_db_read_state(db) != 0) if (apk_db_read_state(db) != 0)
return -1; return -1;
fchdir(db->root_fd); if (apk_repos == NULL)
blob = apk_blob_from_file("etc/apk/repositories"); apk_repos="/etc/apk/repositories";
blob = apk_blob_from_file(apk_repos);
if (!APK_BLOB_IS_NULL(blob)) { if (!APK_BLOB_IS_NULL(blob)) {
apk_blob_for_each_segment(blob, "\n", apk_db_add_repository, db); apk_blob_for_each_segment(blob, "\n", apk_db_add_repository, db);
free(blob.ptr); free(blob.ptr);