From 3d98bd7ff6083fc8f0a3f3c783b91465a31579af Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 9 Jul 2014 02:00:13 -0500 Subject: [PATCH] main: do not munge variables which already contain sysroot_dir in their output (maybe related to #69) --- main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index ce07553..7c87920 100644 --- a/main.c +++ b/main.c @@ -292,7 +292,8 @@ print_variable(pkg_t *pkg, void *data, unsigned int flags) { memset(req->buf, 0, sizeof(req->buf)); - if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX)) + if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX) && + (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir)))) strlcat(req->buf, sysroot_dir, sizeof(req->buf)); strlcat(req->buf, var, sizeof(req->buf)); @@ -301,7 +302,8 @@ print_variable(pkg_t *pkg, void *data, unsigned int flags) strlcat(req->buf, " ", sizeof(req->buf)); - if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX)) + if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX) && + (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir)))) strlcat(req->buf, sysroot_dir, sizeof(req->buf)); strlcat(req->buf, var, sizeof(req->buf));