Merge branch 'maint'

Conflicts:
	recv_common.c

diff --git a/recv_common.c b/recv_common.c
index 535d8c16075dc931d4ec935630e1de92362e3af5..bbaf139688ff6ccb0d78284f1bb495e7dd106a86 100644 (file)
--- a/recv_common.c
+++ b/recv_common.c
@@ -47,14 +47,13 @@ static void *parse_receiver_args(int receiver_num, char *options)
                        return NULL;
                for (i = argc - 1; i >= 0; i--)
                        argv[i + 1] = argv[i];
-               argv[0] = NULL;
                argc++;
        } else {
                argc = 1;
                argv = para_malloc(2 * sizeof(char*));
-               argv[0] = NULL;
                argv[1] = NULL;
        }
+       argv[0] = make_message("%s_recv", r->name);
        conf = r->parse_config(argc, argv);
        for (i = 1; i < argc; i++)
                free(argv[i]);