From: Andre Noll <maan@systemlinux.org>
Date: Sun, 31 Jan 2010 22:25:16 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.2~63
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8;p=paraslash.git

Merge branch 'maint'

Conflicts:
	recv_common.c
---

9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8
diff --cc recv_common.c
index 535d8c16,00c1dd84..bbaf1396
--- a/recv_common.c
+++ b/recv_common.c
@@@ -38,26 -35,22 +38,25 @@@ static void *parse_receiver_args(int re
  	void *conf;
  
  
 -//	PARA_DEBUG_LOG("%s, options: %s\n", r->name,
 -//		options? options : "(none)");
 +	PARA_DEBUG_LOG("%s, options: %s\n", r->name,
 +		options? options : "(none)");
  	if (options) {
  		PARA_DEBUG_LOG("options: %s\n", options);
 -		argc = split_args(options, &argv, " \t");
 +		argc = create_argv(options, " \t", &argv);
 +		if (argc < 0)
 +			return NULL;
  		for (i = argc - 1; i >= 0; i--)
  			argv[i + 1] = argv[i];
- 		argv[0] = NULL;
 -		argc += 1;
 +		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);
 -	free(argv[0]);
 +	for (i = 1; i < argc; i++)
 +		free(argv[i]);
  	free(argv);
  	return conf;
  }