Mercurial > masqmail

diff src/masqmail.c @ 290:792e0201c1b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mark -qo (without argument) obsolete Its behavior (online detect and send over the available route) is included in -q. In the -qo case no local mail would be sent, but why would be not want to do so? We might use -qo (without arg) for something more useful in the future.
author markus schnalke <meillo@marmaro.de>
date Wed, 08 Dec 2010 18:00:22 -0300
parents 84ea0b1fc8f8
children f10a56dc7481
line wrap: on
line diff
--- a/src/masqmail.c	Wed Dec 08 17:17:38 2010 -0300
+++ b/src/masqmail.c	Wed Dec 08 18:00:22 2010 -0300
@@ -371,8 +371,6 @@
 }
 
 /* -qo, -q (without argument), or called as runq */
-/* TODO: are -qo and -q exclusively or not?
-         And how is this related to being a daemon? */
 static int
 run_queue(gboolean do_runq, gboolean do_runq_online, char* route_name)
 {
@@ -390,6 +388,8 @@
 			conf.online_detect = g_strdup("argument");
 			set_online_name(route_name);
 		}
+		/* TODO: change behavior of `-qo without argument'?
+		         Because that behavior is included in -q. */
 		ret = queue_run_online();
 	}
 	return ret;
@@ -567,7 +567,12 @@
 			set_mode(MODE_RUNQUEUE);
 			do_runq_online = TRUE;
 			/* can be NULL, then we use online detection method */
+			/* TODO: behavior might change if it is NULL */
 			route_name = get_optarg(argv, &arg, opt+2);
+			if (!route_name) {
+				fprintf(stderr, "Please do not use -qo without argument anymore; use -q instead.\n");
+				fprintf(stderr, "The behavior for -qo without argument is likely to change.\n");
+			}
 
 		} else if (strncmp(opt, "q", 1) == 0) {
 			/* must be after the `qo' check */