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

main: add whitespace control to --variable output (fixes mozilla libxul stuff)

pull/36/head
William Pitcock 2012-07-30 05:39:44 -05:00
parent fc01992654
commit c8e604c83c
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
main.c
View File

@ -154,18 +154,6 @@ print_modversion(pkg_t *pkg, void *unused, unsigned int flags)
printf("%s\n", pkg->version); printf("%s\n", pkg->version);
} }
static void
print_variable(pkg_t *pkg, void *data, unsigned int flags)
{
const char *varname = data;
const char *var;
(void) flags;
var = pkg_tuple_find(pkg->vars, varname);
if (var != NULL)
printf("%s ", var);
}
static void static void
print_variables(pkg_t *pkg, void *unused, unsigned int flags) print_variables(pkg_t *pkg, void *unused, unsigned int flags)
{ {
@ -248,10 +236,43 @@ apply_variables(pkg_t *world, void *unused, int maxdepth, unsigned int flags)
pkg_traverse(world, print_variables, unused, maxdepth, flags); pkg_traverse(world, print_variables, unused, maxdepth, flags);
} }
typedef struct {
const char *variable;
char buf[PKG_BUFSIZE];
} var_request_t;
static void
print_variable(pkg_t *pkg, void *data, unsigned int flags)
{
var_request_t *req = data;
const char *var;
(void) flags;
var = pkg_tuple_find(pkg->vars, req->variable);
if (var != NULL)
{
if (*(req->buf) == '\0')
{
strlcpy(req->buf, var, sizeof(req->buf));
return;
}
strlcat(req->buf, " ", sizeof(req->buf));
strlcat(req->buf, var, sizeof(req->buf));
}
}
static void static void
apply_variable(pkg_t *world, void *variable, int maxdepth, unsigned int flags) apply_variable(pkg_t *world, void *variable, int maxdepth, unsigned int flags)
{ {
pkg_traverse(world, print_variable, variable, maxdepth, flags); var_request_t req = {
.variable = variable,
};
*req.buf = '\0';
pkg_traverse(world, print_variable, &req, maxdepth, flags);
printf("%s\n", req.buf);
} }
static void static void
@ -787,7 +808,7 @@ main(int argc, char *argv[])
} }
} }
if ((want_flags & (PKG_CFLAGS|PKG_LIBS)) || want_variable != NULL) if (want_flags & (PKG_CFLAGS|PKG_LIBS))
printf("\n"); printf("\n");
pkg_queue_free(pkgq_head); pkg_queue_free(pkgq_head);