/*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
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;
}
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))
.check_required = 0,
.check_ambiguity = 0
};
- if (audioc_cmdline_parser_config_file(cf, &conf, ¶ms)) {
+ ret = audioc_cmdline_parser_config_file(cf, &conf, ¶ms);
+ free(cf);
+ if (ret) {
fprintf(stderr, "parse error in config file\n");
exit(EXIT_FAILURE);
}
goto out;
bufsize = conf.bufsize_arg;
buf = para_malloc(bufsize);
+ ret = mark_fd_blocking(STDOUT_FILENO);
+ if (ret < 0)
+ goto out;
do {
size_t n = ret = recv_bin_buffer(fd, buf, bufsize);
if (ret <= 0)
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;