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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2017-11-09 03:02:01 +01:00
parent f914ccd63a
commit e9f5939e97
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/configure.c
View File

@ -471,6 +471,13 @@ String const * configure_get_soext(Configure * configure)
} }
/* configure_is_flag_set */
unsigned int configure_is_flag_set(Configure * configure, unsigned int flags)
{
return configure->prefs->flags & flags;
}
/* source_extension */ /* source_extension */
String const * _source_extension(String const * source) String const * _source_extension(String const * source)
{ {

2
src/configure.h
View File

@ -182,6 +182,8 @@ String const * configure_get_config(Configure * configure,
String const * configure_get_exeext(Configure * configure); String const * configure_get_exeext(Configure * configure);
String const * configure_get_soext(Configure * configure); String const * configure_get_soext(Configure * configure);
unsigned int configure_is_flag_set(Configure * configure, unsigned int flags);
/* useful */ /* useful */
int configure_error(char const * message, int ret); int configure_error(char const * message, int ret);

34
src/makefile.c
View File

@ -46,10 +46,14 @@
#endif #endif
/* private */
/* prototypes */ /* prototypes */
/* accessors */ /* accessors */
static String const * _makefile_get_config(Configure * configure, static String const * _makefile_get_config(Configure * configure,
String const * section, String const * variable); String const * section, String const * variable);
static unsigned int _makefile_is_flag_set(Configure * configure,
unsigned int flag);
static int _makefile_is_phony(Configure * configure, char const * target); static int _makefile_is_phony(Configure * configure, char const * target);
/* useful */ /* useful */
@ -85,12 +89,12 @@ int makefile(Configure * configure, String const * directory, configArray * ca,
if((makefile = string_new_append(directory, "/", MAKEFILE, NULL)) if((makefile = string_new_append(directory, "/", MAKEFILE, NULL))
== NULL) == NULL)
return -1; return -1;
if(!(configure->prefs->flags & PREFS_n) if(!_makefile_is_flag_set(configure, PREFS_n)
&& (fp = fopen(makefile, "w")) == NULL) && (fp = fopen(makefile, "w")) == NULL)
ret = configure_error(makefile, 1); ret = configure_error(makefile, 1);
else else
{ {
if(configure->prefs->flags & PREFS_v) if(_makefile_is_flag_set(configure, PREFS_v))
printf("%s%s/%s", "Creating ", directory, printf("%s%s/%s", "Creating ", directory,
MAKEFILE "\n"); MAKEFILE "\n");
ret |= _makefile_write(configure, fp, ca, from, to); ret |= _makefile_write(configure, fp, ca, from, to);
@ -182,17 +186,17 @@ static int _variables_package(Configure * configure, FILE * fp,
if((package = _makefile_get_config(configure, NULL, "package")) == NULL) if((package = _makefile_get_config(configure, NULL, "package")) == NULL)
return 0; return 0;
if(configure->prefs->flags & PREFS_v) if(_makefile_is_flag_set(configure, PREFS_v))
printf("%s%s", "Package: ", package); printf("%s%s", "Package: ", package);
if((version = _makefile_get_config(configure, NULL, "version")) == NULL) if((version = _makefile_get_config(configure, NULL, "version")) == NULL)
{ {
if(configure->prefs->flags & PREFS_v) if(_makefile_is_flag_set(configure, PREFS_v))
fputc('\n', stdout); fputc('\n', stdout);
fprintf(stderr, "%s%s%s", PROGNAME ": ", directory, fprintf(stderr, "%s%s%s", PROGNAME ": ", directory,
": \"package\" needs \"version\"\n"); ": \"package\" needs \"version\"\n");
return 1; return 1;
} }
if(configure->prefs->flags & PREFS_v) if(_makefile_is_flag_set(configure, PREFS_v))
printf(" %s\n", version); printf(" %s\n", version);
_makefile_output_variable(fp, "PACKAGE", package); _makefile_output_variable(fp, "PACKAGE", package);
_makefile_output_variable(fp, "VERSION", version); _makefile_output_variable(fp, "VERSION", version);
@ -1534,7 +1538,7 @@ static int _target_script(Configure * configure, FILE * fp,
} }
if(fp == NULL) if(fp == NULL)
_script_check(configure, target, script); _script_check(configure, target, script);
if(configure->prefs->flags & PREFS_S) if(_makefile_is_flag_set(configure, PREFS_S))
_script_security(configure, target, script); _script_security(configure, target, script);
phony = _makefile_is_phony(configure, target); phony = _makefile_is_phony(configure, target);
_makefile_print(fp, "\n%s%s:", phony ? "" : "$(OBJDIR)", _makefile_print(fp, "\n%s%s:", phony ? "" : "$(OBJDIR)",
@ -2437,20 +2441,20 @@ static int _dist_check(Configure * configure, char const * target,
if(mode[0] == '\0' || *p != '\0') if(mode[0] == '\0' || *p != '\0')
return error_set_print(PROGNAME, 1, "%s: %s%s%s", target, return error_set_print(PROGNAME, 1, "%s: %s%s%s", target,
"Invalid permissions \"", mode, "\""); "Invalid permissions \"", mode, "\"");
if((configure->prefs->flags & PREFS_S) && (m & S_ISUID)) if(_makefile_is_flag_set(configure, PREFS_S) && (m & S_ISUID))
error_set_print(PROGNAME, 0, "%s: %s", target, error_set_print(PROGNAME, 0, "%s: %s", target,
"Installed as a SUID file"); "Installed as a SUID file");
if((configure->prefs->flags & PREFS_S) && (m & S_ISUID)) if(_makefile_is_flag_set(configure, PREFS_S) && (m & S_ISUID))
error_set_print(PROGNAME, 0, "%s: %s", target, error_set_print(PROGNAME, 0, "%s: %s", target,
"Installed as a SGID file"); "Installed as a SGID file");
if((configure->prefs->flags & PREFS_S) if(_makefile_is_flag_set(configure, PREFS_S)
&& (m & (S_IXUSR | S_IXGRP | S_IXOTH))) && (m & (S_IXUSR | S_IXGRP | S_IXOTH)))
error_set_print(PROGNAME, 0, "%s: %s", target, error_set_print(PROGNAME, 0, "%s: %s", target,
"Installed as an executable file"); "Installed as an executable file");
if((configure->prefs->flags & PREFS_S) && (m & S_IWGRP)) if(_makefile_is_flag_set(configure, PREFS_S) && (m & S_IWGRP))
error_set_print(PROGNAME, 0, "%s: %s", target, error_set_print(PROGNAME, 0, "%s: %s", target,
"Installed as a group-writable file"); "Installed as a group-writable file");
if((configure->prefs->flags & PREFS_S) && (m & S_IWOTH)) if(_makefile_is_flag_set(configure, PREFS_S) && (m & S_IWOTH))
error_set_print(PROGNAME, 0, "%s: %s", target, error_set_print(PROGNAME, 0, "%s: %s", target,
"Installed as a writable file"); "Installed as a writable file");
return 0; return 0;
@ -2754,6 +2758,14 @@ static String const * _makefile_get_config(Configure * configure,
} }
/* makefile_is_flag_set */
static unsigned int _makefile_is_flag_set(Configure * configure,
unsigned int flag)
{
return configure_is_flag_set(configure, flag);
}
/* makefile_is_phony */ /* makefile_is_phony */
static int _makefile_is_phony(Configure * configure, char const * target) static int _makefile_is_phony(Configure * configure, char const * target)
{ {