X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=f68aee542e1ed2ef48694eae309112cccd3314f2;hp=e12d6e98fce4baa902d03e21c48aee4fba0237da;hb=cf39e478f5379506a003ab8a0a2f14ee8fcf98e4;hpb=65dfcde0ee400d5a32a06122eb47d03d2139212c

diff --git a/audioc.c b/audioc.c
index e12d6e98..f68aee54 100644
--- a/audioc.c
+++ b/audioc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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"
@@ -106,7 +125,7 @@ static void audioc_pre_select(struct sched *s, struct task *t)
 	para_fd_set(at->fd, &s->rfds, &s->max_fileno);
 }
 
-static void audioc_post_select(struct sched *s, struct task *t)
+static int audioc_post_select(struct sched *s, struct task *t)
 {
 	char *buf = NULL;
 	struct audioc_task *at = container_of(t, struct audioc_task, task);
@@ -115,7 +134,7 @@ static void audioc_post_select(struct sched *s, struct task *t)
 	if (ret < 0)
 		goto out;
 	if (!FD_ISSET(at->fd, &s->rfds))
-		return;
+		return 0;
 	buf = para_malloc(conf.bufsize_arg);
 	ret = recv_bin_buffer(at->fd, buf, conf.bufsize_arg);
 	PARA_DEBUG_LOG("recv: %d\n", ret);
@@ -124,16 +143,14 @@ static void audioc_post_select(struct sched *s, struct task *t)
 	if (ret < 0)
 		goto out;
 	btr_add_output(buf, ret, at->btrn);
-	return;
+	return 0;
 out:
 	if (ret < 0) {
 		free(buf);
-		btr_remove_node(at->btrn);
-		btr_free_node(at->btrn);
-		at->btrn = NULL;
+		btr_remove_node(&at->btrn);
 		close(at->fd);
 	}
-	t->error = ret;
+	return ret;
 }
 
 static struct audioc_task audioc_task = {
@@ -159,14 +176,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);
@@ -253,16 +267,15 @@ __noreturn static void print_completions(void)
 
 static char *configfile_exists(void)
 {
-	static char *config_file;
+	char *config_file;
 	struct stat statbuf;
+	char *home = para_homedir();
 
-	if (!config_file) {
-		char *home = para_homedir();
-		config_file = make_message("%s/.paraslash/audioc.conf", home);
-		free(home);
-	}
+	config_file = make_message("%s/.paraslash/audioc.conf", home);
+	free(home);
 	if (!stat(config_file, &statbuf))
 		return config_file;
+	free(config_file);
 	return NULL;
 }
 
@@ -272,10 +285,11 @@ static char *configfile_exists(void)
  * \param argc Usual argument count.
  * \param argv Usual argument vector.
  *
- * It creates a temporary local socket in order to communicate with para_audiod.
- * Authentication consists in sending a ucred buffer that contains the user id.
+ * It connects to the "well-known" local socket to communicate with
+ * para_audiod. Authentication is performed by sending a ucred buffer
+ * containing the user id to the local socket.
  *
- * Any output received through the local socket is sent to stdout.
+ * Any data received from the socket is written to stdout.
  *
  * \return EXIT_SUCCESS or EXIT_FAILURE.
  *
@@ -284,7 +298,7 @@ static char *configfile_exists(void)
 int main(int argc, char *argv[])
 {
 	int ret = -E_AUDIOC_SYNTAX, fd;
-	char *cf, *buf = NULL, *args;
+	char *cf, *buf = NULL, *args = NULL;
 	size_t bufsize;
 
 	if (audioc_cmdline_parser(argc, argv, &conf))
@@ -298,7 +312,9 @@ int main(int argc, char *argv[])
 			.check_required = 0,
 			.check_ambiguity = 0
 		};
-		if (audioc_cmdline_parser_config_file(cf, &conf, &params)) {
+		ret = audioc_cmdline_parser_config_file(cf, &conf, &params);
+		free(cf);
+		if (ret) {
 			fprintf(stderr, "parse error in config file\n");
 			exit(EXIT_FAILURE);
 		}
@@ -320,14 +336,12 @@ 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;
@@ -336,9 +350,11 @@ int main(int argc, char *argv[])
 		size_t n = ret = recv_bin_buffer(fd, buf, bufsize);
 		if (ret <= 0)
 			break;
-		ret = write_all(STDOUT_FILENO, buf, &n);
+		ret = write_all(STDOUT_FILENO, buf, n);
 	} while (ret >= 0);
 out:
+	free(buf);
+	free(args);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;