X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=6b1a64f978c9dadf38cd6cf46c4070e74f384510;hp=f91f41ffc99e004ff8468000f6579ee045265ff8;hb=e65bdaa6b207d5cd409acaa5d0d33fe85dd7a28d;hpb=a4f75cecaaee538edb7aae3f0ff19168a1dab59d

diff --git a/audioc.c b/audioc.c
index f91f41ff..6b1a64f9 100644
--- a/audioc.c
+++ b/audioc.c
@@ -1,14 +1,13 @@
 /*
- * Copyright (C) 2005-2010 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 */
+/** \file audioc.c The client program used to connect to para_audiod. */
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "audioc.cmdline.h"
 #include "para.h"
@@ -16,6 +15,7 @@
 #include "net.h"
 #include "string.h"
 #include "fd.h"
+#include "version.h"
 
 INIT_AUDIOC_ERRLISTS;
 
@@ -27,7 +27,9 @@ INIT_STDERR_LOGGING(loglevel);
 
 static char *concat_args(unsigned argc, char * const *argv)
 {
-	int i; char *buf = NULL;
+	int i;
+	char *buf = NULL;
+
 	for (i = 0; i < argc; i++) {
 		buf = para_strcat(buf, argv[i]);
 		if (i != argc - 1)
@@ -41,7 +43,6 @@ static char *configfile_exists(void)
 	static char *config_file;
 	struct stat statbuf;
 
-
 	if (!config_file) {
 		char *home = para_homedir();
 		config_file = make_message("%s/.paraslash/audioc.conf", home);
@@ -53,17 +54,17 @@ static char *configfile_exists(void)
 }
 
 /**
- * the client program to connect to para_audiod
+ * The client program to connect to para_audiod.
  *
- * \param argc usual argument count
- * \param argv usual argument vector
+ * \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
+ * \return EXIT_SUCCESS or EXIT_FAILURE.
  *
  * \sa send_cred_buffer(), para_audioc(1), para_audiod(1).
  */
@@ -95,16 +96,16 @@ int main(int argc, char *argv[])
 		para_strdup("stat");
 
 	if (conf.socket_given)
-		ret = create_remote_socket(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 = create_remote_socket(socket_name);
+		ret = connect_local_socket(socket_name);
 		free(hn);
 		free(socket_name);
 	}
 	if (ret < 0) {
-		PARA_EMERG_LOG("failed to create remote socket\n");
+		PARA_EMERG_LOG("failed to connect to local socket\n");
 		goto out;
 	}
 	fd = ret;