From 793de6a06ca52fbfe906a269b5f2b2ba41739517 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sat, 5 May 2012 21:39:37 -0500 Subject: [PATCH] main: handle pkg-config 'package' '>=' 'version' in 3 fields. --- main.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index 6d9366e..246334d 100644 --- a/main.c +++ b/main.c @@ -248,7 +248,7 @@ pkg_queue_push(pkg_queue_t *parent, const char *package) { pkg_queue_t *pkgq = calloc(sizeof(pkg_queue_t), 1); - pkgq->package = package; + pkgq->package = strdup(package); pkgq->prev = parent; if (pkgq->prev != NULL) pkgq->prev->next = pkgq; @@ -528,13 +528,32 @@ main(int argc, char *argv[]) while (1) { - const char *package = argv[optind++]; + const char *package = argv[optind]; + if (package == NULL) break; - pkgq = pkg_queue_push(pkgq, package); - if (pkgq_head == NULL) - pkgq_head = pkgq; + if (argv[optind + 1] == NULL || !PKG_OPERATOR_CHAR(*(argv[optind + 1]))) + { + 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)