git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation and comment tidies.
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 622b1ed01e4581d9d5d2526c0cbb2d1b03230cdf..60e5b52617b68b49419a113e9e1d635d367c6d5c 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/exim.c,v 1.
47 2006/11/07 10:28:09
ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.
50 2006/11/20 11:43:40
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-1498,7
+1498,8
@@
regex_ismsgid =
regex_must_compile(US"^(?:[^\\W_]{6}-){2}[^\\W_]{2}$", FALSE, TRUE);
/* Precompile the regular expression that is used for matching an SMTP error
regex_must_compile(US"^(?:[^\\W_]{6}-){2}[^\\W_]{2}$", FALSE, TRUE);
/* Precompile the regular expression that is used for matching an SMTP error
-code, possibly extended, at the start of an error message. */
+code, possibly extended, at the start of an error message. Note that the
+terminating whitespace character is included. */
regex_smtp_code =
regex_must_compile(US"^\\d\\d\\d\\s(?:\\d\\.\\d\\d?\\d?\\.\\d\\d?\\d?\\s)?",
regex_smtp_code =
regex_must_compile(US"^\\d\\d\\d\\s(?:\\d\\.\\d\\d?\\d?\\.\\d\\d?\\d?\\s)?",
@@
-2646,6
+2647,11
@@
for (i = 1; i < argc; i++)
case 'q':
receiving_message = FALSE;
case 'q':
receiving_message = FALSE;
+ if (queue_interval >= 0)
+ {
+ fprintf(stderr, "exim: -q specified more than once\n");
+ exit(EXIT_FAILURE);
+ }
/* -qq...: Do queue runs in a 2-stage manner */
/* -qq...: Do queue runs in a 2-stage manner */
@@
-2754,7
+2760,6
@@
for (i = 1; i < argc; i++)
}
}
else deliver_selectstring = argrest;
}
}
else deliver_selectstring = argrest;
- if (queue_interval < 0) queue_interval = 0;
break;
break;
@@
-2802,7
+2807,6
@@
for (i = 1; i < argc; i++)
}
}
else deliver_selectstring_sender = argrest;
}
}
else deliver_selectstring_sender = argrest;
- if (queue_interval < 0) queue_interval = 0;
break;
/* -Tqt is an option that is exclusively for use by the testing suite.
break;
/* -Tqt is an option that is exclusively for use by the testing suite.
@@
-2893,6
+2897,12
@@
for (i = 1; i < argc; i++)
}
}
+/* If -R or -S have been specified without -q, assume a single queue run. */
+
+if ((deliver_selectstring != NULL || deliver_selectstring_sender != NULL) &&
+ queue_interval < 0) queue_interval = 0;
+
+
/* Arguments have been processed. Check for incompatibilities. */
END_ARG:
/* Arguments have been processed. Check for incompatibilities. */
END_ARG:
@@
-4238,6
+4248,7
@@
if (expansion_test)
message_linecount += body_linecount;
(void)dup2(save_stdin, 0);
(void)close(save_stdin);
message_linecount += body_linecount;
(void)dup2(save_stdin, 0);
(void)close(save_stdin);
+ clearerr(stdin); /* Required by Darwin */
}
/* Allow $recipients for this testing */
}
/* Allow $recipients for this testing */