From: Andre Noll <maan@systemlinux.org>
Date: Sun, 4 Mar 2012 21:40:27 +0000 (+0100)
Subject: Merge branch 't/audioc_cleanups'
X-Git-Tag: v0.4.10~8
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=0703f75a276020f9645f987134d49402f7c019c0;hp=-c

Merge branch 't/audioc_cleanups'

Has been cooking for long enough.
---

0703f75a276020f9645f987134d49402f7c019c0
diff --combined NEWS
index e5ae590e,16e8e4e8..d9e0d0a3
--- a/NEWS
+++ b/NEWS
@@@ -2,15 -2,6 +2,16 @@@
  0.4.10 (to be announced) "heterogeneous vacuum"
  -----------------------------------------------
  
 +	- The --no_default_filters option of para_filter has been
 +	  depricated. It still works but has no effect and will be
 +	  removed in the next version.
 +	- Cleanup and consolidation of the various wrappers for
 +	  write(), writev(), send() and friends.
 +	- The obscure error messages on mmap() failures have been
 +	  replaced by meaningful messages. This affects mainly
 +	  para_afh.
++	- para_audioc: Cleanups and memory leak fixes.
 +
  -------------------------------------
  0.4.9 (2011-12-06) "hybrid causality"
  -------------------------------------
diff --combined audioc.c
index 84c2a394,09b21ba9..d3e092e2
--- a/audioc.c
+++ b/audioc.c
@@@ -253,16 -253,15 +253,15 @@@ __noreturn static void print_completion
  
  static char *configfile_exists(void)
  {
- 	static char *config_file;
+ 	char *config_file;
  	struct stat statbuf;
+ 	char *home = para_homedir();
  
- 	if (!config_file) {
- 		char *home = para_homedir();
- 		config_file = make_message("%s/.paraslash/audioc.conf", home);
- 		free(home);
- 	}
+ 	config_file = make_message("%s/.paraslash/audioc.conf", home);
+ 	free(home);
  	if (!stat(config_file, &statbuf))
  		return config_file;
+ 	free(config_file);
  	return NULL;
  }
  
@@@ -272,10 -271,11 +271,11 @@@
   * \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.
+  * It connects to the "well-known" local socket to communicate with
+  * para_audiod. Authentication is performed by sending a ucred buffer
+  * containing the user id to the local socket.
   *
-  * Any output received through the local socket is sent to stdout.
+  * Any data received from the socket is written to stdout.
   *
   * \return EXIT_SUCCESS or EXIT_FAILURE.
   *
@@@ -284,7 -284,7 +284,7 @@@
  int main(int argc, char *argv[])
  {
  	int ret = -E_AUDIOC_SYNTAX, fd;
- 	char *cf, *buf = NULL, *args;
+ 	char *cf, *buf = NULL, *args = NULL;
  	size_t bufsize;
  
  	if (audioc_cmdline_parser(argc, argv, &conf))
@@@ -298,7 -298,9 +298,9 @@@
  			.check_required = 0,
  			.check_ambiguity = 0
  		};
- 		if (audioc_cmdline_parser_config_file(cf, &conf, &params)) {
+ 		ret = audioc_cmdline_parser_config_file(cf, &conf, &params);
+ 		free(cf);
+ 		if (ret) {
  			fprintf(stderr, "parse error in config file\n");
  			exit(EXIT_FAILURE);
  		}
@@@ -339,9 -341,11 +341,11 @@@
  		size_t n = ret = recv_bin_buffer(fd, buf, bufsize);
  		if (ret <= 0)
  			break;
 -		ret = write_all(STDOUT_FILENO, buf, &n);
 +		ret = write_all(STDOUT_FILENO, buf, n);
  	} while (ret >= 0);
  out:
+ 	free(buf);
+ 	free(args);
  	if (ret < 0)
  		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
  	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;