X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audioc.c;h=b2c6786a6573ba2636606cde09403e38a590e0c6;hb=3b7cc768deb62e635bd06541418d22b59d35883c;hp=74fb11cb0622cbab54f5c46ce28cbd5856efffe8;hpb=d46a0767b58654f15f16406cf99296287bd0d534;p=paraslash.git

diff --git a/audioc.c b/audioc.c
index 74fb11cb..b2c6786a 100644
--- a/audioc.c
+++ b/audioc.c
@@ -42,6 +42,25 @@ static char *concat_args(unsigned argc, char * const *argv)
 	return buf;
 }
 
+static int connect_audiod(const char *sname, char *args)
+{
+	int fd = -1, ret;
+
+	ret = connect_local_socket(sname);
+	if (ret < 0)
+		goto fail;
+	fd = ret;
+	ret = send_cred_buffer(fd, args);
+	if (ret < 0)
+		goto fail;
+	return fd;
+fail:
+	PARA_ERROR_LOG("could not connect %s\n", sname);
+	if (fd >= 0)
+		close(fd);
+	return ret;
+}
+
 #ifdef HAVE_READLINE
 #include "list.h"
 #include "sched.h"
@@ -146,8 +165,6 @@ static int audioc_i9e_line_handler(char *line)
 {
 	char *args = NULL;
 	int ret;
-	if (!line || !*line)
-		return 0;
 
 	PARA_DEBUG_LOG("line: %s\n", line);
 	ret = create_argv(line, " ", &conf.inputs);
@@ -157,14 +174,11 @@ static int audioc_i9e_line_handler(char *line)
 	args = concat_args(conf.inputs_num, conf.inputs);
 	free_argv(conf.inputs);
 	conf.inputs_num = 0; /* required for audioc_cmdline_parser_free() */
-	ret = connect_local_socket(socket_name);
+	ret = connect_audiod(socket_name, args);
 	if (ret < 0)
 		goto out;
 	at->fd = ret;
 	ret = mark_fd_nonblocking(at->fd);
-	if (ret < 0)
-		goto close;
-	ret = send_cred_buffer(at->fd, args);
 	if (ret < 0)
 		goto close;
 	free(args);
@@ -320,21 +334,16 @@ int main(int argc, char *argv[])
 		interactive_session();
 	args = concat_args(conf.inputs_num, conf.inputs);
 
-	ret = connect_local_socket(socket_name);
+	ret = connect_audiod(socket_name, args);
 	free(socket_name);
-	if (ret < 0) {
-		PARA_EMERG_LOG("failed to connect to local socket\n");
+	if (ret < 0)
 		goto out;
-	}
 	fd = ret;
-	ret = send_cred_buffer(fd, args);
+	ret = mark_fd_blocking(STDOUT_FILENO);
 	if (ret < 0)
 		goto out;
 	bufsize = conf.bufsize_arg;
 	buf = para_malloc(bufsize);
-	ret = mark_fd_blocking(STDOUT_FILENO);
-	if (ret < 0)
-		goto out;
 	do {
 		size_t n = ret = recv_bin_buffer(fd, buf, bufsize);
 		if (ret <= 0)