X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=adcae715e28d29c48da934a16360dab8b5ecc476;hp=0036da83144bc180d1f3df104f93e4276caaf1b7;hb=c0dca63e02352cae6a8c241dba4bc0d2c7cde050;hpb=5dacd7f03bbed65aaa400e7372e01de2c652c925

diff --git a/audioc.c b/audioc.c
index 0036da83..adcae715 100644
--- a/audioc.c
+++ b/audioc.c
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file audioc.c the client program used to connect to para_audiod */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -15,13 +16,15 @@
 #include "net.h"
 #include "string.h"
 #include "fd.h"
+#include "version.h"
 
 INIT_AUDIOC_ERRLISTS;
 
-/** the gengetopt structure containing command line args */
-struct audioc_args_info conf;
+/** The gengetopt structure containing command line args. */
+static struct audioc_args_info conf;
 
-INIT_STDERR_LOGGING(conf.loglevel_arg);
+static int loglevel;
+INIT_STDERR_LOGGING(loglevel);
 
 static char *concat_args(unsigned argc, char * const *argv)
 {
@@ -69,8 +72,7 @@ int main(int argc, char *argv[])
 {
 	int ret = -E_AUDIOC_SYNTAX, fd;
 	char *cf, *buf = NULL, *args;
-	size_t bufsize, loaded = 0;
-	struct sockaddr_un unix_addr;
+	size_t bufsize;
 
 	if (audioc_cmdline_parser(argc, argv, &conf))
 		goto out;
@@ -88,72 +90,38 @@ int main(int argc, char *argv[])
 			exit(EXIT_FAILURE);
 		}
 	}
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	args = conf.inputs_num?
 		concat_args(conf.inputs_num, conf.inputs) :
 		para_strdup("stat");
-	bufsize = conf.bufsize_arg;
-	buf = para_malloc(bufsize);
-	ret = get_stream_socket(PF_UNIX);
-	if (ret < 0)
-		goto out;
-	fd = ret;
+
 	if (conf.socket_given)
-		ret = init_unix_addr(&unix_addr, conf.socket_arg);
+		ret = connect_local_socket(conf.socket_arg);
 	else {
 		char *hn = para_hostname(), *socket_name = make_message(
 			"/var/paraslash/audiod_socket.%s", hn);
+		ret = connect_local_socket(socket_name);
 		free(hn);
-		ret = init_unix_addr(&unix_addr, socket_name);
 		free(socket_name);
 	}
-	if (ret < 0)
-		goto out;
-	ret = PARA_CONNECT(fd, &unix_addr);
-	if (ret < 0)
+	if (ret < 0) {
+		PARA_EMERG_LOG("failed to connect to local socket\n");
 		goto out;
+	}
+	fd = ret;
 	ret = send_cred_buffer(fd, args);
 	if (ret < 0)
 		goto out;
-	for (;;) {
-		int max_fileno = -1, check_write = 0;
-		ssize_t len;
-		fd_set rfd, wfd;
-		FD_ZERO(&rfd);
-		FD_ZERO(&wfd);
-		if (loaded < bufsize)
-			para_fd_set(fd, &rfd, &max_fileno);
-		if (loaded > 0) {
-			para_fd_set(STDOUT_FILENO, &wfd, &max_fileno);
-			check_write = 1;
-		}
-		ret = -E_AUDIOC_OVERRUN;
-		if (max_fileno < 0)
-			goto out;
-		ret = para_select(max_fileno + 1, &rfd, &wfd, NULL);
-		if (ret < 0)
-			goto out;
-		if (loaded < bufsize && FD_ISSET(fd, &rfd)) {
-			len = recv_bin_buffer(fd, buf + loaded,
-				bufsize - loaded);
-			if (len <= 0) {
-				ret = len < 0? -E_AUDIOC_READ : 0;
-				goto out;
-			}
-			loaded += len;
-		}
-		if (check_write && FD_ISSET(STDOUT_FILENO, &wfd)) {
-			ret = write(STDOUT_FILENO, buf, loaded);
-			if (ret < 0) {
-				ret = -E_AUDIOC_WRITE;
-				goto out;
-			}
-			loaded -= ret;
-		}
-	}
+	bufsize = conf.bufsize_arg;
+	buf = para_malloc(bufsize);
+	do {
+		size_t n = ret = recv_bin_buffer(fd, buf, bufsize);
+		if (ret <= 0)
+			break;
+		ret = write_all(STDOUT_FILENO, buf, &n);
+	} while (ret >= 0);
 out:
-	if (!ret && loaded && buf)
-		ret = write(STDOUT_FILENO, buf, loaded);
 	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }