diff options
author | Dave Davenport <qball@gmpclient.org> | 2015-07-31 12:23:41 +0200 |
---|---|---|
committer | Dave Davenport <qball@gmpclient.org> | 2015-07-31 12:23:41 +0200 |
commit | dffc27e5aa13dd5e5ada9cee24e4a7151d82f8b6 (patch) | |
tree | 2e8c5ab572490c248cda718682ed8a690591626b /source/helper.c | |
parent | 69c75971f38fa9be1c09df4a1dc0cd6003b857a9 (diff) |
Try to make things more robust, e.g. try to recover before giving up.
Diffstat (limited to 'source/helper.c')
-rw-r--r-- | source/helper.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/helper.c b/source/helper.c index 6d4e4766..061a510b 100644 --- a/source/helper.c +++ b/source/helper.c @@ -307,7 +307,8 @@ char helper_parse_char ( const char *arg ) } if ( retv < 0 ) { fprintf ( stderr, "Failed to parse character string: \"%s\"\n", arg ); - exit ( 1 ); + // for now default to newline. + retv = '\n'; } return retv; } @@ -458,14 +459,6 @@ void remove_pid_file ( int fd ) */ void config_sanity_check ( ) { - if ( find_arg ( "-rnow" ) >= 0 || find_arg ( "-snow" ) >= 0 || - find_arg ( "-now" ) >= 0 || find_arg ( "-key" ) >= 0 || - find_arg ( "-skey" ) >= 0 || find_arg ( "-rkey" ) >= 0 ) { - fprintf ( stderr, "The -snow, -now, -rnow, -key, -rkey, -skey are deprecated " - "and have been removed.\n" - "Please see the manpage: %s -help for the correct syntax.", stored_argv[0] ); - exit ( EXIT_FAILURE ); - } int found_error = FALSE; GString *msg = g_string_new ( "<big><b>The configuration failed to validate:</b></big>\n" ); if ( config.element_height < 1 ) { |