ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

main: handle pkg-config 'package' '>=' 'version' in 3 fields.

pull/15/head
William Pitcock 2012-05-05 21:39:37 -05:00
parent 433d697351
commit 793de6a06c
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
main.c
View File

@ -248,7 +248,7 @@ pkg_queue_push(pkg_queue_t *parent, const char *package)
{ {
pkg_queue_t *pkgq = calloc(sizeof(pkg_queue_t), 1); pkg_queue_t *pkgq = calloc(sizeof(pkg_queue_t), 1);
pkgq->package = package; pkgq->package = strdup(package);
pkgq->prev = parent; pkgq->prev = parent;
if (pkgq->prev != NULL) if (pkgq->prev != NULL)
pkgq->prev->next = pkgq; pkgq->prev->next = pkgq;
@ -528,13 +528,32 @@ main(int argc, char *argv[])
while (1) while (1)
{ {
const char *package = argv[optind++]; const char *package = argv[optind];
if (package == NULL) if (package == NULL)
break; break;
pkgq = pkg_queue_push(pkgq, package); if (argv[optind + 1] == NULL || !PKG_OPERATOR_CHAR(*(argv[optind + 1])))
if (pkgq_head == NULL) {
pkgq_head = pkgq; pkgq = pkg_queue_push(pkgq, package);
if (pkgq_head == NULL)
pkgq_head = pkgq;
optind++;
}
else
{
char packagebuf[BUFSIZ];
snprintf(packagebuf, sizeof packagebuf, "%s %s %s", package, argv[optind + 1], argv[optind + 2]);
optind += 3;
pkgq = pkg_queue_push(pkgq, packagebuf);
if (pkgq_head == NULL)
pkgq_head = pkgq;
}
} }
if (pkgq_head == NULL) if (pkgq_head == NULL)