/*
* 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 */
INIT_AUDIOC_ERRLISTS;
+/** the gengetopt structure containing command line args */
struct audioc_args_info conf;
-char *tmpfifo;
INIT_STDERR_LOGGING(conf.loglevel_arg);
-static char *concat_args(const int argc, char * const *argv)
+static char *concat_args(unsigned argc, char * const *argv)
{
int i; char *buf = NULL;
for (i = 0; i < argc; i++) {
return NULL;
}
+/**
+ * the client program to connect to para_audiod
+ *
+ * \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
+ *
+ * \sa send_cred_buffer(), para_audioc(1), para_audiod(1).
+ */
int main(int argc, char *argv[])
{
struct sockaddr_un unix_addr;
- int ret = -E_AUDIOC_SYNTAX, fd, loaded = 0;
+ 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, 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, ¶ms)) {
fprintf(stderr, "parse error in config file\n");
exit(EXIT_FAILURE);
}
args = conf.inputs_num?
concat_args(conf.inputs_num, conf.inputs) :
para_strdup("stat");
- buf = para_malloc(conf.bufsize_arg);
+ bufsize = conf.bufsize_arg;
+ buf = para_malloc(bufsize);
if (conf.socket_given)
socket_name = para_strdup(conf.socket_arg);
else
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);
+ free(tmpsocket_name);
if (ret < 0)
goto out;
fd = ret;
ret = -E_INIT_SOCK_ADDR;
if (init_unix_addr(&unix_addr, socket_name) < 0)
goto out;
- ret = - E_AUDIOC_CONNECT;
- if (connect(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX) < 0)
+ ret = -E_AUDIOC_CONNECT;
+ if (connect(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX) < 0) /* FIXME: Use para_connect() */
goto out;
ret = send_cred_buffer(fd, args);
if (ret < 0)
fd_set rfd, wfd;
FD_ZERO(&rfd);
FD_ZERO(&wfd);
- if (loaded < conf.bufsize_arg)
+ if (loaded < bufsize)
para_fd_set(fd, &rfd, &max_fileno);
if (loaded > 0) {
para_fd_set(STDOUT_FILENO, &wfd, &max_fileno);
ret = para_select(max_fileno + 1, &rfd, &wfd, NULL);
if (ret < 0)
goto out;
- if (loaded < conf.bufsize_arg && FD_ISSET(fd, &rfd)) {
+ if (loaded < bufsize && FD_ISSET(fd, &rfd)) {
len = recv_bin_buffer(fd, buf + loaded,
- conf.bufsize_arg - loaded);
+ bufsize - loaded);
if (len <= 0) {
ret = len < 0? -E_AUDIOC_READ : 0;
goto out;