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

Add a test and warning for scripts to exist

Browse Source
This commit is contained in:
Pierre Pronchery 2016-09-11 23:57:01 +02:00
parent 2801d693f5
commit 8c7d171455
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/makefile.c
View File

@ -29,11 +29,13 @@
#include <System.h> #include <System.h>
#include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <libgen.h> #include <libgen.h>
#include <errno.h>
#include "settings.h" #include "settings.h"
#include "configure.h" #include "configure.h"
#include "../config.h" #include "../config.h"
@ -1448,6 +1450,7 @@ static int _write_objects(Configure * configure, FILE * fp)
return ret; return ret;
} }
static void _script_check(Configure * configure, String const * script);
static int _script_depends(Configure * configure, FILE * fp, static int _script_depends(Configure * configure, FILE * fp,
String const * target); String const * target);
static int _target_script(Configure * configure, FILE * fp, static int _target_script(Configure * configure, FILE * fp,
@ -1463,6 +1466,8 @@ static int _target_script(Configure * configure, FILE * fp,
": No script for target\n"); ": No script for target\n");
return 1; return 1;
} }
if(fp == NULL)
_script_check(configure, script);
if(configure->prefs->flags & PREFS_S) if(configure->prefs->flags & PREFS_S)
error_set_print(PROGNAME, 0, "%s: %s%s%s", target, "The \"", error_set_print(PROGNAME, 0, "%s: %s%s%s", target, "The \"",
script, script,
@ -1478,6 +1483,24 @@ static int _target_script(Configure * configure, FILE * fp,
return 0; return 0;
} }
static void _script_check(Configure * configure, String const * script)
{
String const * directory;
String * p = NULL;
if((directory = config_get(configure->config, NULL, "directory"))
== NULL)
error_print(PROGNAME);
else if((p = string_new_append((script[0] == '/') ? "" : directory,
(script[0] == '/') ? "" : "/",
script, NULL)) == NULL)
error_print(PROGNAME);
else if(access(p, R_OK | X_OK) != 0)
/* XXX make it clear it is a warning */
error_set_print(PROGNAME, 0, "%s: %s", p, strerror(errno));
string_delete(p);
}
static int _script_depends(Configure * configure, FILE * fp, static int _script_depends(Configure * configure, FILE * fp,
String const * target) String const * target)
{ {