X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=3134faa1165b5972bff64f230e294c40f6615fe8;hp=aa7184e09070d4742650cc7b72904ab066ebc482;hb=f8a941c97b6d0a891d0e075c4996d033a7db63bf;hpb=b9ff47c00a184f572037a05f40d9ea62222f514c

diff --git a/audioc.c b/audioc.c
index aa7184e0..3134faa1 100644
--- a/audioc.c
+++ b/audioc.c
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 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 */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -18,10 +19,11 @@
 
 INIT_AUDIOC_ERRLISTS;
 
-/** the gengetopt structure containing command line args */
-struct audioc_args_info conf;
+/** The gengetopt structure containing command line args. */
+static 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)
 {
@@ -87,6 +89,7 @@ int main(int argc, char *argv[])
 			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");
@@ -106,7 +109,12 @@ int main(int argc, char *argv[])
 	if (ret < 0)
 		goto out;
 	fd = ret;
-
+	ret = mark_fd_nonblocking(fd);
+	if (ret < 0)
+		goto out;
+	ret = mark_fd_nonblocking(STDOUT_FILENO);
+	if (ret < 0)
+		goto out;
 	ret = send_cred_buffer(fd, args);
 	if (ret < 0)
 		goto out;
@@ -144,12 +152,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;
 }