From dacf0eccac32280f24c046553c6be3a2b282769d Mon Sep 17 00:00:00 2001 From: Aurelien Foret Date: Sat, 20 Aug 2005 05:54:45 +0000 Subject: changed license package field to a list --- lib/libalpm/db.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/libalpm/db.c') diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 7f24224b..f7d04bfe 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -301,10 +301,9 @@ int db_read(pmdb_t *db, char *name, unsigned int inforeq, pmpkg_t *info) } _alpm_strtrim(info->url); } else if(!strcmp(line, "%LICENSE%")) { - if(fgets(info->license, sizeof(info->license), fp) == NULL) { - return(-1); + while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + info->license = pm_list_add(info->license, strdup(line)); } - _alpm_strtrim(info->license); } else if(!strcmp(line, "%ARCH%")) { if(fgets(info->arch, sizeof(info->arch), fp) == NULL) { return(-1); @@ -473,7 +472,10 @@ int db_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq) fputs("%URL%\n", fp); fprintf(fp, "%s\n\n", info->url); fputs("%LICENSE%\n", fp); - fprintf(fp, "%s\n\n", info->license); + for(lp = info->license; lp; lp = lp->next) { + fprintf(fp, "%s\n", (char *)lp->data); + } + fprintf(fp, "\n"); fputs("%ARCH%\n", fp); fprintf(fp, "%s\n\n", info->arch); fputs("%BUILDDATE%\n", fp); -- cgit v1.2.3-24-g4f1b