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

main: fix personalities when argv[0] contains path

pull/188/head
Emil Renner Berthing 2019-03-06 16:03:32 +01:00
parent e2fdd6f470
commit d926e75b34
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cli/main.c
View File

@ -740,21 +740,30 @@ dump_personality(const pkgconf_cross_personality_t *p)
static pkgconf_cross_personality_t *
deduce_personality(char *argv[])
{
char *workbuf = strdup(argv[0]), *i;
pkgconf_cross_personality_t *out = pkgconf_cross_personality_default(), *deduced;
const char *argv0 = argv[0];
char *i, *prefix;
pkgconf_cross_personality_t *out;
i = strstr(workbuf, "-pkg");
i = strrchr(argv0, '/');
if (i != NULL)
argv0 = i + 1;
#if defined(_WIN32) || defined(_WIN64)
i = strrchr(argv0, '\\');
if (i != NULL)
argv0 = i + 1;
#endif
i = strstr(argv0, "-pkg");
if (i == NULL)
goto finish;
return pkgconf_cross_personality_default();
*i = 0;
prefix = strndup(argv0, i - argv0);
out = pkgconf_cross_personality_find(prefix);
free(prefix);
if (out == NULL)
return pkgconf_cross_personality_default();
deduced = pkgconf_cross_personality_find(workbuf);
if (deduced != NULL)
out = deduced;
finish:
free(workbuf);
return out;
}