diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-03-15 09:49:56 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-03-15 09:49:56 +0000 |
commit | f0c33e12d40f8776e8bdfa246438390fc2ed3ff0 (patch) | |
tree | c3b0fae9bc7701ef184864fbe14da9d10060008b /src/main.c | |
parent | 501704dbbdc2dc676ba95fac83562bf01dfc037d (diff) | |
download | mailfromd-f0c33e12d40f8776e8bdfa246438390fc2ed3ff0.tar.gz mailfromd-f0c33e12d40f8776e8bdfa246438390fc2ed3ff0.tar.bz2 |
* src/dnsbase.c (comp_pref): Secondary ordering by MX name
* src/main.c, testsuite/lib/mailfromd.exp, doc/mailfromd.texi:
Discontinue support for the old semantics of options -c, -l and -L.
* doc/Makefile.am (check-exceptions): Fix the rule
* NEWS: Update
git-svn-id: file:///svnroot/mailfromd/trunk@1289 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 27 |
1 files changed, 18 insertions, 9 deletions
@@ -894,12 +894,14 @@ enum mailfromd_option { OPTION_DUMP_TREE, OPTION_DUMP_XREF, OPTION_EXPIRE, OPTION_FOREGROUND, OPTION_DEBUG_GACOPYZ, OPTION_IGNORE_FAILED_READS, + OPTION_LINT, + OPTION_LOG_TAG, OPTION_LIST, OPTION_LOCK_RETRY_COUNT, OPTION_LOCK_RETRY_TIMEOUT, OPTION_MILTER_TIMEOUT, OPTION_PIDFILE, OPTION_POSTMASTER_EMAIL, @@ -924,23 +926,28 @@ static struct argp_option options[] = { { "expire", OPTION_EXPIRE, NULL, 0, N_("Delete expired entries from the cache"), GRP+1 }, { "compact", OPTION_COMPACT, NULL, 0, N_("Compact the database"), GRP+1 }, { "test", 't', N_("state"), OPTION_ARG_OPTIONAL, N_("Run in test mode"), GRP+1 }, - { "lint", 'l', NULL, 0, + { "lint", OPTION_LINT, NULL, 0, N_("Check syntax and exit"), GRP+1 }, { "syntax-check", 0, NULL, OPTION_ALIAS, NULL, GRP+1 }, { "show-defaults", OPTION_SHOW_DEFAULTS, NULL, 0, N_("Show compilation defaults"), GRP+1 }, { "daemon", OPTION_DAEMON, NULL, 0, N_("Run in daemon mode (default)"), GRP+1 }, /* Reserved for future use: */ { "compile", 'c', NULL, OPTION_HIDDEN, N_("Compile files"), GRP+1 }, + { "load", 'l', N_("FILE"), OPTION_HIDDEN, + N_("Load library"), GRP+1 }, + { "load-dir", 'L', N_("DIR"), OPTION_HIDDEN, + N_("Add DIR to the load path"), GRP+1 }, + #undef GRP #define GRP 15 { NULL, 0, NULL, 0, N_("Database management options"), GRP }, { "file", 'f', N_("FILE"), 0, @@ -1037,13 +1044,13 @@ static struct argp_option options[] = { N_("Milter protocol trace"), GRP+1 }, { "dump-xref", 0, NULL, OPTION_ALIAS, NULL, GRP+1 }, { "stderr", 's', NULL, 0, N_("Log to stderr"), GRP+1 }, { "syslog", OPTION_SYSLOG, NULL, 0, N_("Log to syslog (default)"), GRP+1 }, - { "log-tag", 'L', N_("STRING"), 0, + { "log-tag", OPTION_LOG_TAG, N_("STRING"), 0, N_("Set the identifier used in syslog messages to STRING"), GRP+1 }, { "source-info", OPTION_SOURCE_INFO, NULL, 0, N_("Debug messages include source information"), GRP+1 }, #undef GRP /*DEPRECATED OPTIONS*/ @@ -1078,17 +1085,12 @@ validate_options() static error_t parse_opt (int key, char *arg, struct argp_state *state) { switch (key) { - case 'c': - argp_error(state, - "-c is obsolete; give filter script as an argument"); - break; - case 'D': set_option("ehlo", arg, 1); break; case 'd': set_option("debug", arg, 1); @@ -1139,18 +1141,25 @@ parse_opt (int key, char *arg, struct argp_state *state) mode = MAILFROMD_LIST; break; case OPTION_TIME_FORMAT: time_format_string = arg; break; - + + case 'c': + case 'l': case 'L': + argp_error(state, "The option `-%c' is not yet implemented", + key); + break; + + case OPTION_LOG_TAG: syslog_tag = arg; break; - case 'l': + case OPTION_LINT: script_check = 1; break; case 'p': set_option("port", arg, 1); break; |