projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Error if -q is given more than once.
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 0b764e99ab3544615a05fd5ca20614070e5c22a3..6f53c1ffbf433f2ecefe849ae5958d5ccdf14299 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/exim.c,v 1.4
8 2006/11/07 11:07:43
ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.4
9 2006/11/13 11:56:41
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-2646,6
+2646,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
+2759,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
+2806,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
+2896,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: