X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=66ff2a267dc5228056cce913055afc177f9c6560;hp=89b7b178351bc8dbe1b7409ac9e62d3c878c452b;hb=a08d65fa0cbc5f79632be742b818f621f3dc48d0;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf;ds=inline

diff --git a/audioc.c b/audioc.c
index 89b7b178..66ff2a26 100644
--- a/audioc.c
+++ b/audioc.c
@@ -6,12 +6,15 @@
 
 /** \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;
 
@@ -68,14 +71,20 @@ int main(int argc, char *argv[])
 	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;
+	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);
 		}
@@ -83,6 +92,7 @@ int main(int argc, char *argv[])
 	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);
@@ -96,16 +106,17 @@ int main(int argc, char *argv[])
 		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);
+	ret = create_local_socket(tmpsocket_name, &unix_addr, S_IRUSR | S_IWUSR);
 	unlink(tmpsocket_name);
+	free(tmpsocket_name);
 	if (ret < 0)
 		goto out;
 	fd = ret;
 	ret = -E_INIT_SOCK_ADDR;
 	if (init_unix_addr(&unix_addr, socket_name) < 0)
 		goto out;
-	ret = -E_AUDIOC_CONNECT;
-	if (connect(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX) < 0)
+	ret = PARA_CONNECT(fd, &unix_addr);
+	if (ret < 0)
 		goto out;
 	ret = send_cred_buffer(fd, args);
 	if (ret < 0)