diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-10-28 20:36:29 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-10-28 20:46:42 +0300 |
commit | 8a851aaa1382d188ca2968e7bbd813e99507c4ff (patch) | |
tree | f10b7611125dc5124a66a0a5cda7d544a93d14d1 /src/main.c | |
parent | f964cda496a9e01e5c941da71a9841fb0c2b2174 (diff) | |
download | mailfromd-8a851aaa1382d188ca2968e7bbd813e99507c4ff.tar.gz mailfromd-8a851aaa1382d188ca2968e7bbd813e99507c4ff.tar.bz2 |
Finish conversion. Version 7.99.96
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 42 |
1 files changed, 7 insertions, 35 deletions
@@ -649,2 +649,3 @@ static char *capa[] = { "mailer", + ".mfd:server", NULL @@ -1010,3 +1011,3 @@ mailfromd_show_defaults() static int -argpflag(int argc, char **argv) +args_in_order(int argc, char **argv) { @@ -1019,7 +1020,6 @@ argpflag(int argc, char **argv) || memcmp(argv[i], "--run", 5) == 0)) { - flag = ARGP_IN_ORDER; - break; + return 1; } } - return flag; + return 0; } @@ -1028,3 +1028,3 @@ argpflag(int argc, char **argv) static void -provide_default_milter_server() +provide_default_milter_server(void) { @@ -1137,29 +1137,2 @@ struct mu_cli_setup cli = { int -mf_getopt(struct mu_cli_setup *cli, int *pargc, char ***pargv, char **capa) -{ - struct mu_parseopt pohint; - struct mu_cfg_parse_hints cfhint; - - cfhint.site_rcfile = DEFAULT_CONFIG_FILE; - cfhint.flags = MU_CFG_PARSE_SITE_RCFILE; - - pohint.po_flags = 0; - - pohint.po_package_name = PACKAGE_NAME; - pohint.po_flags |= MU_PARSEOPT_PACKAGE_NAME; - - pohint.po_package_url = PACKAGE_URL; - pohint.po_flags |= MU_PARSEOPT_PACKAGE_URL; - - pohint.po_bug_address = PACKAGE_BUGREPORT; - pohint.po_flags |= MU_PARSEOPT_BUG_ADDRESS; - - pohint.po_version_hook = mailfromd_version; - pohint.po_flags |= MU_PARSEOPT_VERSION_HOOK; - - mu_cli_ext (*pargc, *pargv, cli, &pohint, &cfhint, capa, NULL, - pargc, pargv); -} - -int main(int argc, char **argv) @@ -1208,3 +1181,4 @@ main(int argc, char **argv) - mf_getopt(&cli, &argc, &argv, capa); + mf_getopt(&cli, &argc, &argv, capa, args_in_order(argc, argv), + DEFAULT_CONFIG_FILE); @@ -1212,4 +1186,2 @@ main(int argc, char **argv) exit(EX_USAGE); - if (rc) - exit(EX_CONFIG); |