DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Truncate scripts at the first space to get the path

Browse Source
This commit is contained in:
Pierre Pronchery 2016-09-15 03:02:21 +02:00
parent 54aa67d2bd
commit 1c3e7d8062
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/makefile.c
View File

@ -1522,7 +1522,10 @@ static int _script_depends(Configure * configure, FILE * fp,
static String * _script_path(Configure * configure, String const * script) static String * _script_path(Configure * configure, String const * script)
{ {
String * ret;
String const * directory; String const * directory;
ssize_t i;
String * p = NULL;
if((directory = config_get(configure->config, NULL, "directory")) if((directory = config_get(configure->config, NULL, "directory"))
== NULL) == NULL)
@ -1530,11 +1533,24 @@ static String * _script_path(Configure * configure, String const * script)
error_print(PROGNAME); error_print(PROGNAME);
return NULL; return NULL;
} }
/* XXX truncate scripts at the first space (to allow arguments) */
if((i = string_index(script, " ")) > 0)
{
if((p = string_new_length(script, i)) == NULL)
{
error_print(PROGNAME);
return NULL;
}
script = p;
}
if(script[0] == '/') if(script[0] == '/')
return string_new(script); ret = string_new(script);
else if(string_compare_length(script, "./", 2) == 0) else if(string_compare_length(script, "./", 2) == 0)
return string_new_append(directory, &script[1], NULL); ret = string_new_append(directory, &script[1], NULL);
return string_new_append(directory, "/", script, NULL); else
ret = string_new_append(directory, "/", script, NULL);
string_delete(p);
return ret;
} }
static void _script_security(Configure * configure, String const * target, static void _script_security(Configure * configure, String const * target,