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

fragment: increase robustness with MacOS -framework (closes #56)

pull/62/head
William Pitcock 2013-12-27 11:37:24 +00:00
parent 49ad1cd8f1
commit 2e0e4b2ece
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fragment.c
View File

@ -21,15 +21,38 @@ pkg_fragment_add(pkg_list_t *list, const char *string)
{
pkg_fragment_t *frag;
frag = calloc(sizeof(pkg_fragment_t), 1);
if (*string == '-' && strncmp(string, "-lib:", 5) && strncmp(string, "-framework", 10))
{
frag = calloc(sizeof(pkg_fragment_t), 1);
frag->type = *(string + 1);
frag->data = strdup(string + 2);
}
else
{
if (list->tail != NULL && list->tail->data != NULL)
{
pkg_fragment_t *parent = list->tail->data;
if (!strncmp(parent->data, "-framework", 10))
{
size_t len = strlen(parent->data) + strlen(string) + 2;
char *newdata;
newdata = malloc(len);
strlcpy(newdata, parent->data, len);
strlcat(newdata, " ", len);
strlcat(newdata, string, len);
free(parent->data);
parent->data = newdata;
return;
}
}
frag = calloc(sizeof(pkg_fragment_t), 1);
frag->type = 0;
frag->data = strdup(string);
}