From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Mon, 18 Feb 2019 18:07:27 +0000 (-0600)
Subject: Merge branch 'args-parser'
X-Git-Tag: v0.0.2~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ae6f47d6e3932d3efc59f72d5a75845090b3801;p=thirdparty%2FFORT-validator.git

Merge branch 'args-parser'

The merge is lazy. Review postponed until next commit.
---

5ae6f47d6e3932d3efc59f72d5a75845090b3801
diff --cc src/main.c
index 65b90ea4,4b15ffb5..81991994
--- a/src/main.c
+++ b/src/main.c
@@@ -174,21 -117,17 +83,22 @@@ main(int argc, char **argv
  	struct tal *tal;
  	int error;
  
- 	error = handle_args(argc, argv);
- 	if (error)
- 		return error;
 +	print_stack_trace_on_segfault();
 +
- 	error = rsync_init();
+ 	error = handle_flags_config(argc, argv);
  	if (error)
  		return error;
  
 -	print_stack_trace_on_segfault();
 -
+ 	error = rsync_init(config_get_enable_rsync());
+ 	if (error)
 -		goto end;
++		goto end1;
+ 
 -	add_rpki_oids();
 +	error = nid_init();
 +	if (error)
- 		goto end;
++		goto end2;
 +	error = extension_init();
 +	if (error)
- 		goto end;
++		goto end2;
  	thvar_init();
  	fnstack_store();
  	fnstack_push(config_get_tal());
@@@ -207,7 -141,8 +117,9 @@@
  		tal_destroy(tal);
  	}
  
- end:
++end2:
  	rsync_destroy();
 -end:
++end1:
+ 	free_rpki_config();
  	return error;
  }