masqmail

diff src/masqmail.c @ 290:792e0201c1b3

find changesets by author, revision, files, or words in the commit message
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 diff
     1.1 --- a/src/masqmail.c	Wed Dec 08 17:17:38 2010 -0300
     1.2 +++ b/src/masqmail.c	Wed Dec 08 18:00:22 2010 -0300
     1.3 @@ -371,8 +371,6 @@
     1.4  }
     1.5  
     1.6  /* -qo, -q (without argument), or called as runq */
     1.7 -/* TODO: are -qo and -q exclusively or not?
     1.8 -         And how is this related to being a daemon? */
     1.9  static int
    1.10  run_queue(gboolean do_runq, gboolean do_runq_online, char* route_name)
    1.11  {
    1.12 @@ -390,6 +388,8 @@
    1.13  			conf.online_detect = g_strdup("argument");
    1.14  			set_online_name(route_name);
    1.15  		}
    1.16 +		/* TODO: change behavior of `-qo without argument'?
    1.17 +		         Because that behavior is included in -q. */
    1.18  		ret = queue_run_online();
    1.19  	}
    1.20  	return ret;
    1.21 @@ -567,7 +567,12 @@
    1.22  			set_mode(MODE_RUNQUEUE);
    1.23  			do_runq_online = TRUE;
    1.24  			/* can be NULL, then we use online detection method */
    1.25 +			/* TODO: behavior might change if it is NULL */
    1.26  			route_name = get_optarg(argv, &arg, opt+2);
    1.27 +			if (!route_name) {
    1.28 +				fprintf(stderr, "Please do not use -qo without argument anymore; use -q instead.\n");
    1.29 +				fprintf(stderr, "The behavior for -qo without argument is likely to change.\n");
    1.30 +			}
    1.31  
    1.32  		} else if (strncmp(opt, "q", 1) == 0) {
    1.33  			/* must be after the `qo' check */