summaryrefslogtreecommitdiffabout
path: root/src/main.c
authorSergey Poznyakoff <gray@gnu.org.ua>2007-03-15 09:49:56 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2007-03-15 09:49:56 (GMT)
commitf0c33e12d40f8776e8bdfa246438390fc2ed3ff0 (patch) (side-by-side diff)
treec3b0fae9bc7701ef184864fbe14da9d10060008b /src/main.c
parent501704dbbdc2dc676ba95fac83562bf01dfc037d (diff)
downloadmailfromd-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') (more/less context) (ignore whitespace changes)
-rw-r--r--src/main.c27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/main.c b/src/main.c
index f146b12..a817ffa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -897,6 +897,8 @@ enum mailfromd_option {
OPTION_FOREGROUND,
OPTION_DEBUG_GACOPYZ,
OPTION_IGNORE_FAILED_READS,
+ OPTION_LINT,
+ OPTION_LOG_TAG,
OPTION_LIST,
OPTION_LOCK_RETRY_COUNT,
OPTION_LOCK_RETRY_TIMEOUT,
@@ -927,7 +929,7 @@ static struct argp_option options[] = {
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,
@@ -938,6 +940,11 @@ static struct argp_option options[] = {
/* 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
@@ -1040,7 +1047,7 @@ static struct argp_option options[] = {
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 },
@@ -1081,11 +1088,6 @@ 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;
@@ -1142,12 +1144,19 @@ parse_opt (int key, char *arg, struct argp_state *state)
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;

Return to:

Send suggestions and report system problems to the System administrator.