X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=e20e887eda56a79969113a875468ea25696ea3ab;hp=0f4c5c5084d8dbf31c726ae6d3e5ccf67bcb7d29;hb=e373f7da2c890a1af8f46d444057609b15f3d248;hpb=786010c598f79d20280e6ea9ea458cad4a7e9af7

diff --git a/audioc.c b/audioc.c
index 0f4c5c50..e20e887e 100644
--- a/audioc.c
+++ b/audioc.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file audioc.c the client program used to connect to para_audiod */
@@ -27,26 +15,12 @@
 
 INIT_AUDIOC_ERRLISTS;
 
+/** the gengetopt structure containing command line args */
 struct audioc_args_info conf;
-char *tmpfifo;
-
-
-/*
- * client log function
- */
-void para_log(int ll, const char* fmt,...)
-{
-	va_list argp;
 
-	/* ignore log message if loglevel is not high enough */
-	if (ll < conf.loglevel_arg)
-		return;
-	va_start(argp, fmt);
-	vfprintf(stderr, fmt, argp);
-	va_end(argp);
-}
+INIT_STDERR_LOGGING(conf.loglevel_arg);
 
-static char *concat_args(const int argc, char * const *argv)
+static char *concat_args(unsigned argc, char * const *argv)
 {
 	int i; char *buf = NULL;
 	for (i = 0; i < argc; i++) {
@@ -73,16 +47,32 @@ static char *configfile_exists(void)
 	return NULL;
 }
 
+/**
+ * the client program to connect to para_audiod
+ *
+ * \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.
+ *
+ * Any output received through the local socket is sent to stdout.
+ *
+ * \return EXIT_SUCCESS or EXIT_FAILURE
+ *
+ * \sa send_cred_buffer(), para_audioc(1), para_audiod(1).
+ */
 int main(int argc, char *argv[])
 {
 	struct sockaddr_un unix_addr;
-	int ret = -E_AUDIOC_SYNTAX, fd, loaded = 0;
+	int ret = -E_AUDIOC_SYNTAX, fd;
 	char *cf, *socket_name, *randname = para_tmpname(), *tmpsocket_name = NULL,
 		*buf = NULL, *hn = para_hostname(), *args, *home = para_homedir();
-
+	size_t bufsize, loaded = 0;
 
 	if (audioc_cmdline_parser(argc, argv, &conf))
 		goto out;
+	HANDLE_VERSION_FLAG("audioc", conf);
 	cf = configfile_exists();
 	if (cf) {
 		if (audioc_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
@@ -93,7 +83,8 @@ int main(int argc, char *argv[])
 	args = conf.inputs_num?
 		concat_args(conf.inputs_num, conf.inputs) :
 		para_strdup("stat");
-	buf = para_malloc(conf.bufsize_arg);
+	bufsize = conf.bufsize_arg;
+	buf = para_malloc(bufsize);
 	if (conf.socket_given)
 		socket_name = para_strdup(conf.socket_arg);
 	else
@@ -114,7 +105,7 @@ int main(int argc, char *argv[])
 	ret = -E_INIT_SOCK_ADDR;
 	if (init_unix_addr(&unix_addr, socket_name) < 0)
 		goto out;
-	ret = - E_AUDIOC_CONNECT;
+	ret = -E_AUDIOC_CONNECT;
 	if (connect(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX) < 0)
 		goto out;
 	ret = send_cred_buffer(fd, args);
@@ -126,7 +117,7 @@ int main(int argc, char *argv[])
 		fd_set rfd, wfd;
 		FD_ZERO(&rfd);
 		FD_ZERO(&wfd);
-		if (loaded < conf.bufsize_arg)
+		if (loaded < bufsize)
 			para_fd_set(fd, &rfd, &max_fileno);
 		if (loaded > 0) {
 			para_fd_set(STDOUT_FILENO, &wfd, &max_fileno);
@@ -138,9 +129,9 @@ int main(int argc, char *argv[])
 		ret = para_select(max_fileno + 1, &rfd, &wfd, NULL);
 		if (ret < 0)
 			goto out;
-		if (loaded < conf.bufsize_arg && FD_ISSET(fd, &rfd)) {
+		if (loaded < bufsize && FD_ISSET(fd, &rfd)) {
 			len = recv_bin_buffer(fd, buf + loaded,
-				conf.bufsize_arg - loaded);
+				bufsize - loaded);
 			if (len <= 0) {
 				ret = len < 0? -E_AUDIOC_READ : 0;
 				goto out;