Add --notify-wait (-9) option (not set by default).

Using it prevents running of several notification scripts in parallel
which can lead to races if the scripts are used for logging.

ChangeLog

@@ -1,6 +1,9 @@
 xxxx-xx-xx : Version -next
  * Add new notification message STREAM_NOT_ENCRYPTED. When stream is not
    encrypted no NO_CODE_WORD notifications are sent.
+ * Add --notify-wait (-9) option (not set by default). Using it prevents
+   running of several notification scripts in parallel which can lead to
+   races if the scripts are used for logging.
 
 2013-09-12 : Version 10.0
  * Add --ecm-only (-v) option. This allows processing of ECMs but without

README

@@ -102,6 +102,8 @@ Main options:
  -i --ident <server>        | Format PROVIDER/CHANNEL. Default: empty
  -d --daemon <pidfile>      | Daemonize program and write pid file.
  -N --notify-program <prg>  | Execute <prg> to report events. Default: empty
+ -9 --notify-wait           | Enable one by one notification delivery.
+                            . Default: not set (async, deliver ASAP)
 
 Input options:
  -I --input <source>        | Where to read from. File or multicast address.

data.h

@@ -359,6 +359,7 @@ struct ts {
 
 	struct notify		*notify;
 	char				*notify_program;
+	int					notify_wait;
 
 	unsigned int		input_buffer_time;
 	LIST				*input_buffer;

notify.c

@@ -143,6 +143,8 @@ static void notify_func(struct ts *ts, int sync_msg, char *msg_id, char *msg_tex
 	np = calloc(1, sizeof(struct npriv));
 
 	np->sync = sync_msg;
+	if (ts->notify_wait)
+		np->sync = 1;
 	npriv_init_defaults(ts->notify, np);
 
 	strncpy(np->msg_id, msg_id, sizeof(np->ident) - 1);

tsdecrypt.1

@@ -30,6 +30,19 @@ and an example on how to create your own notification script.
 
 See \fBEVENTS\fR section for detailed description of the events.
 .TP
+\fB\-9\fR, \fB\-\-notify-wait\fR
+Wait for notification script to exit before starting another notification.
+
+By default notifications script is executed as soon as notification is
+received. But since several notifications might come at one time, there
+is no guarantee that notification script would be run sequentially. The
+notification script for newer notification might be run before an older
+notification.
+
+Setting this option makes sure that you'll have only one notify script
+running. \fB*NOTE*\fR if you set this option make sure that notification
+script does not take a lot of time to run or you'll run into problems.
+.TP
 \fB\-S\fR, \fB\-\-syslog\fR
 Write log messages to local syslog.
 .TP

tsdecrypt.c

@@ -77,7 +77,7 @@ static void LOG_func(const char *msg) {
 		LOG(msg);
 }
 
-static const char short_options[] = "i:d:N:Sl:L:F:I:1:RzM:T:W:O:o:t:rk:g:upwxyc:C:Y:Q:A:s:U:P:B:46eZ:Ef:a:X:vqH:G:2:KJ:D:jbhVn:m:";
+static const char short_options[] = "i:d:N:9Sl:L:F:I:1:RzM:T:W:O:o:t:rk:g:upwxyc:C:Y:Q:A:s:U:P:B:46eZ:Ef:a:X:vqH:G:2:KJ:D:jbhVn:m:";
 
 // Unused short options: 035789
 static const struct option long_options[] = {
@@ -88,6 +88,7 @@ static const struct option long_options[] = {
 	{ "syslog-port",		required_argument, NULL, 'L' },
 	{ "log-file",			required_argument, NULL, 'F' },
 	{ "notify-program",		required_argument, NULL, 'N' },
+	{ "notify-wait",		no_argument,       NULL, '9' },
 
 	{ "input",				required_argument, NULL, 'I' },
 	{ "input-source",		required_argument, NULL, '1' },
@@ -160,6 +161,8 @@ static void show_help(struct ts *ts) {
 	printf(" -i --ident <server>        | Format PROVIDER/CHANNEL. Default: empty\n");
 	printf(" -d --daemon <pidfile>      | Daemonize program and write pid file.\n");
 	printf(" -N --notify-program <prg>  | Execute <prg> to report events. Default: empty\n");
+	printf(" -9 --notify-wait           | Enable one by one notification delivery.\n");
+	printf("                            . Default: not set (async, deliver ASAP)\n");
 	printf("\n");
 	printf("Input options:\n");
 	printf(" -I --input <source>        | Where to read from. File or multicast address.\n");
@@ -314,7 +317,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 			case 'N': // --notify-program
 				ts->notify_program = optarg;
 				break;
-
+			case '9': // --notify-wait
+				ts->notify_wait = !ts->notify_wait;
+				break;
 			case 'S': // --syslog
 				ts->syslog_active = 1;
 				ts->syslog_remote = 0;
@@ -682,7 +687,7 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 	if (ts->ident)
 		ts_LOGf("Ident      : %s\n", ts->ident);
 	if (ts->notify_program)
-		ts_LOGf("Notify prg : %s\n", ts->notify_program);
+		ts_LOGf("Notify prg : %s (%s)\n", ts->notify_program, ts->notify_wait ? "sync" : "async");
 	if (ts->pidfile)
 		ts_LOGf("Daemonize  : %s pid file.\n", ts->pidfile);
 	if (ts->syslog_active) {