bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ini.c: make errors in includes fatal

Browse source 
If an error in the main file would be fatal there is little reason to
ignore the error in an included file.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2013-07-22 02:46:53 -04:00 • committed by Allan McRae
parent bf1c8e3a3c
commit 4d4f46ba2a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/pacman/ini.c
View file

@ -153,8 +153,12 @@ static int _parse_ini(const char *file, ini_parser_fn cb, void *data,
for(gindex = 0; gindex < globbuf.gl_pathc; gindex++) { for(gindex = 0; gindex < globbuf.gl_pathc; gindex++) {
pm_printf(ALPM_LOG_DEBUG, "config file %s, line %d: including %s\n", pm_printf(ALPM_LOG_DEBUG, "config file %s, line %d: including %s\n",
file, linenum, globbuf.gl_pathv[gindex]); file, linenum, globbuf.gl_pathv[gindex]);
_parse_ini(globbuf.gl_pathv[gindex], cb, data, ret =_parse_ini(globbuf.gl_pathv[gindex], cb, data,
section_name, line, depth + 1); section_name, line, depth + 1);
if(ret) {
globfree(&globbuf);
goto cleanup;
}
} }
break; break;
} }