X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=5c081da5d7ab94437f042e2eac80233c8bd09aa2;hp=7c6fd8c05e257c8c2f5a5ed1f2e97afbd8bacf81;hb=3f9051d22fcf6e968259946eaf521ac3daac470e;hpb=a7a37b282c4e936b2fb34c2bd7423f9f800dfd44

diff --git a/audioc.c b/audioc.c
index 7c6fd8c0..5c081da5 100644
--- a/audioc.c
+++ b/audioc.c
@@ -1,36 +1,28 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 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 */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "audioc.cmdline.h"
 #include "para.h"
+#include "error.h"
 #include "net.h"
 #include "string.h"
 #include "fd.h"
-#include "error.h"
 
 INIT_AUDIOC_ERRLISTS;
 
 /** the gengetopt structure containing command line args */
 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)
 {
@@ -76,48 +68,51 @@ static char *configfile_exists(void)
  */
 int main(int argc, char *argv[])
 {
-	struct sockaddr_un unix_addr;
 	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 = conf.bufsize_arg, loaded = 0;
+	char *cf, *buf = NULL, *args;
+	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)) {
+		struct audioc_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		if (audioc_cmdline_parser_config_file(cf, &conf, &params)) {
 			fprintf(stderr, "parse error in config file\n");
 			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);
-	if (conf.socket_given)
-		socket_name = para_strdup(conf.socket_arg);
-	else
-		socket_name = make_message(
-			"/var/paraslash/audiod_socket.%s", hn);
-	if (conf.tmpdir_given)
-		tmpsocket_name = make_message("%s/audioc.sock.%s.%s",
-			conf.tmpdir_arg, hn, randname);
-	else
-		tmpsocket_name = make_message("%s/.paraslash/audioc_sock.%s.%s",
-			home, hn, randname);
 
-	ret = create_pf_socket(tmpsocket_name, &unix_addr, S_IRUSR | S_IWUSR);
-	unlink(tmpsocket_name);
+	if (conf.socket_given) {
+		ret = create_remote_socket(conf.socket_arg);
+	} else {
+		char *hn = para_hostname(),
+		     *socket_name = make_message("/var/paraslash/audiod_socket.%s", hn);
+
+		ret = create_remote_socket(socket_name);
+		free(hn);
+		free(socket_name);
+	}
 	if (ret < 0)
 		goto out;
 	fd = ret;
-	ret = -E_INIT_SOCK_ADDR;
-	if (init_unix_addr(&unix_addr, socket_name) < 0)
+	ret = mark_fd_nonblocking(fd);
+	if (ret < 0)
 		goto out;
-	ret = -E_AUDIOC_CONNECT;
-	if (connect(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX) < 0)
+	ret = mark_fd_nonblocking(STDOUT_FILENO);
+	if (ret < 0)
 		goto out;
 	ret = send_cred_buffer(fd, args);
 	if (ret < 0)
@@ -156,12 +151,14 @@ int main(int argc, char *argv[])
 				goto out;
 			}
 			loaded -= ret;
+			if (loaded && ret)
+				memmove(buf, buf + ret, loaded);
 		}
 	}
 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;
 }