From: Andre <maan@p133.(none)>
Date: Sat, 6 May 2006 18:25:07 +0000 (+0200)
Subject: Merge branch 'master' into aac
X-Git-Tag: v0.2.14~146
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=12b81c91b25b9d0d4bce43c4f87220c3c7f991da;hp=4dff2e74d0fe7788195820f9b2c822eb7b7c9482

Merge branch 'master' into aac
---

diff --git a/audiod.c b/audiod.c
index a78ccd68..bd87cf87 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1096,8 +1096,9 @@ static int setup_default_filters(void)
 		free(tmp);
 		if (ret < 0)
 			goto out;
-		PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i], filters[j].name);
-		ret = add_filter(i, para_strdup("wav"));
+		PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
+			filters[j].name);
+		ret = add_filter(i, "wav");
 		if (ret < 0)
 			goto out;
 		PARA_INFO_LOG("%s -> default filter: wav\n", audio_formats[i]);
diff --git a/grab_client.c b/grab_client.c
index b58c456e..026211fd 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -99,6 +99,7 @@ static int check_gc_args(struct grab_client *gc)
 	if (!mv[i])
 		return -E_GC_SYNTAX;
 	gc->mode = i;
+	gc->audio_format_num = -1;
 	if (conf->audio_format_given) {
 		gc->audio_format_num = get_audio_format_num(conf->audio_format_arg);
 		if (gc->audio_format_num < 0)
diff --git a/http_recv.c b/http_recv.c
index 49c10f95..5f1d7799 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -83,7 +83,7 @@ static void http_shutdown(void)
 static char *make_request_msg(void)
 {
 	char *ret, *hn = para_hostname();
-	ret = make_message("%s\nHost: %s\nUser-Agent: para_recv/%s\n\n\n",
+	ret = make_message("%s1.0\nHost: %s\nUser-Agent: para_recv/%s\n\n\n",
 		HTTP_GET_MSG, hn, VERSION);
 	free(hn);
 	return ret;
diff --git a/net.c b/net.c
index bf35162f..d4472c0e 100644
--- a/net.c
+++ b/net.c
@@ -189,8 +189,11 @@ int recv_buffer(int fd, char *buf, ssize_t size)
 {
 	int n;
 
-	if ((n = recv_bin_buffer(fd, buf, size - 1)) >= 0)
+	n = recv_bin_buffer(fd, buf, size - 1);
+	if (n >= 0)
 		buf[n] = '\0';
+	else
+		*buf = '\0';
 	return n;
 }
 
@@ -514,8 +517,8 @@ int recv_pattern(int fd, const char *pattern, size_t bufsize)
 		goto out;
 	ret = 1;
 out:
-	free(buf);
 	if (ret < 0)
-		PARA_NOTICE_LOG("did not receive pattern '%s'\n", buf);
+		PARA_NOTICE_LOG("did not receive pattern '%s'\n", pattern);
+	free(buf);
 	return ret;
 }