ph10 2006/11/13 11:56:41 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src exim.c
Log:
Error if -q is given more than once.
Revision Changes Path
1.431 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.49 +11 -2 exim/exim-src/src/exim.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- ChangeLog 13 Nov 2006 11:26:37 -0000 1.430
+++ ChangeLog 13 Nov 2006 11:56:41 -0000 1.431
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.430 2006/11/13 11:26:37 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.431 2006/11/13 11:56:41 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -263,6 +263,8 @@
PH/40 Import PCRE release 6.7 (fixes some bugs).
PH/41 Add bitwise logical operations to eval (courtesy Brad Jorsch).
+
+PH/42 Give an error if -q is specified more than once.
Exim version 4.63
Index: exim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- exim.c 7 Nov 2006 11:07:43 -0000 1.48
+++ exim.c 13 Nov 2006 11:56:41 -0000 1.49
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim.c,v 1.48 2006/11/07 11:07:43 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/exim.c,v 1.49 2006/11/13 11:56:41 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2646,6 +2646,11 @@
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 */
@@ -2754,7 +2759,6 @@
}
}
else deliver_selectstring = argrest;
- if (queue_interval < 0) queue_interval = 0;
break;
@@ -2802,7 +2806,6 @@
}
}
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.
@@ -2891,6 +2894,12 @@
exit(EXIT_FAILURE);
}
}
+
+
+/* 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. */
