Exit immediately if the system config file cannot be parsed.

This commit is contained in:
Reza Snowdon 2010-11-29 15:24:48 +01:00 committed by Giuseppe Scrivano
parent 8aa378bd9e
commit 20a64d03d8
2 changed files with 15 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2010-11-27 Reza Snowdon <vivi@mage.me.uk>
* init.c (initialize): If 'ok' is not zero; exit, as
this indicates there was a problem parsing 'SYSTEM_WGETRC'.
Fixes bug #20370
2010-11-22 Giuseppe Scrivano <gscrivano@gnu.org>
Revert last commit.

View File

@ -588,6 +588,15 @@ initialize (void)
else if (file_exists_p (SYSTEM_WGETRC))
ok &= run_wgetrc (SYSTEM_WGETRC);
#endif
/* If there are any problems parsing the system wgetrc file, tell
the user and exit */
if (! ok)
{
fprintf (stderr, _("\
Parsing system wgetrc file failed, please check '%s'. \
Or specify a different file using --config\n"), SYSTEM_WGETRC);
exit (2);
}
/* Override it with your own, if one exists. */
file = wgetrc_file_name ();
if (!file)