X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=42372caea04d0ad155d29d81523c967da4257e4c;hp=7c6fd8c05e257c8c2f5a5ed1f2e97afbd8bacf81;hb=cd4b294da6f6802d9918c8fe5bcecb8a2a2363c3;hpb=df3c03e72911edb31e7f1e32ebe29dad063e3b70

diff --git a/audioc.c b/audioc.c
index 7c6fd8c0..42372cae 100644
--- a/audioc.c
+++ b/audioc.c
@@ -1,19 +1,7 @@
 /*
  * 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 */
@@ -80,14 +68,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);
 		}
@@ -95,6 +89,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);
@@ -108,7 +103,7 @@ 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);
 	if (ret < 0)
 		goto out;