Commit 09385545 authored by Natanael Copa's avatar Natanael Copa
Browse files

db, package: new dependency format, second try

dependencies are separated with single space rather than ', '.
makes db file slightly easier to parse from a shell script which
might be handy.
parent 94239066
......@@ -502,8 +502,8 @@ static int apk_db_scriptdb_read(struct apk_database *db, struct apk_istream *is)
int apk_db_create(const char *root)
{
apk_blob_t deps = APK_BLOB_STR("busybox, alpine-baselayout, "
"apk-tools, alpine-conf\n");
apk_blob_t deps = APK_BLOB_STR("busybox alpine-baselayout "
"apk-tools alpine-conf\n");
int fd;
fchdir(apk_cwd_fd);
......
......@@ -123,13 +123,13 @@ void apk_deps_parse(struct apk_database *db,
int i;
start = blob.ptr;
for (i = 0; i < blob.len; i++) {
if (blob.ptr[i] != ',' && blob.ptr[i] != '\n')
for (i = 0; i < blob.len && blob.ptr[i] != '\n'; i++) {
if (blob.ptr[i] != ' ')
continue;
parse_depend(db, depends,
APK_BLOB_PTR_PTR(start, &blob.ptr[i-1]));
start = &blob.ptr[i+1];
start = &blob.ptr[i];
}
parse_depend(db, depends,
APK_BLOB_PTR_PTR(start, &blob.ptr[i-1]));
......@@ -145,7 +145,7 @@ int apk_deps_format(char *buf, int size,
for (i = 0; i < depends->num - 1; i++)
n += snprintf(&buf[n], size-n,
"%s, ",
"%s ",
depends->item[i].name->name);
n += snprintf(&buf[n], size-n,
"%s\n",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment