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

Now also handling the CPATH environment variable

Browse Source
This commit is contained in:
Pierre Pronchery 2008-04-11 11:49:42 +00:00
parent 91cd493f83
commit 6e4a2a6db2
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main.c
View File

@ -59,6 +59,7 @@ static int _usage(void)
/* public */ /* public */
/* main */ /* main */
static int _main_default_paths(C99Prefs * prefs);
static int _main_add_define(C99Prefs * prefs, char * define); static int _main_add_define(C99Prefs * prefs, char * define);
static int _main_add_path(C99Prefs * prefs, char const * path); static int _main_add_path(C99Prefs * prefs, char const * path);
static int _main_add_undefine(C99Prefs * prefs, char const * undefine); static int _main_add_undefine(C99Prefs * prefs, char const * undefine);
@ -69,8 +70,7 @@ int main(int argc, char * argv[])
int o; int o;
memset(&prefs, 0, sizeof(prefs)); memset(&prefs, 0, sizeof(prefs));
/* default path */ if(_main_default_paths(&prefs) != 0)
if(_main_add_path(&prefs, "/usr/include") != 0)
return 2; return 2;
while((o = getopt(argc, argv, "cD:EgI:L:o:O123sU:")) != -1) while((o = getopt(argc, argv, "cD:EgI:L:o:O123sU:")) != -1)
switch(o) switch(o)
@ -122,6 +122,25 @@ int main(int argc, char * argv[])
return _c99(&prefs, argc - optind, &argv[optind]) == 0 ? 0 : 2; return _c99(&prefs, argc - optind, &argv[optind]) == 0 ? 0 : 2;
} }
static int _main_default_paths(C99Prefs * prefs)
{
char * paths[] = { "/usr/include" };
size_t i;
char * cpath;
for(i = 0; i < (sizeof(paths) / sizeof(*paths)); i++)
if(_main_add_path(prefs, paths[i]) != 0)
return 2;
if((cpath = getenv("CPATH")) == NULL)
return 0;
while((cpath = strtok(cpath, ":")) != NULL)
if(_main_add_path(prefs, cpath) != 0)
return 2;
else
cpath = NULL;
return 0;
}
static int _main_add_define(C99Prefs * prefs, char * define) static int _main_add_define(C99Prefs * prefs, char * define)
{ {
char ** p; char ** p;