fade.c: replace args_info by conf

[paraslash.git] / audioc.c

diff --git a/audioc.c b/audioc.c
index afff14a18b9427fdbbf8ef3b0a4104b12cf9246f..551c34e63b80d86c05be4103a02c9209c5fd0051 100644 (file)
--- a/audioc.c
+++ b/audioc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * 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
@@ -27,30 +27,12 @@
 
 INIT_AUDIOC_ERRLISTS;
 
-struct gengetopt_args_info conf;
-char *tmpfifo;
+/** the gengetopt structure containing command line args */
+struct audioc_args_info conf;
 
+INIT_STDERR_LOGGING(conf.loglevel_arg);
 
-/*
- * client log function
- */
-void para_log(int ll, const char* fmt,...)
-{
-       va_list argp;
-
-       /* ignore log message if loglevel is not high enough */
-       if (ll < conf.loglevel_arg)
-               return;
-       va_start(argp, fmt);
-       vfprintf(stderr, fmt, argp);
-       va_end(argp);
-}
-
-/* audioc does not use encryption */
-void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, unsigned char *outdata) = NULL;
-void (*crypt_function_send)(unsigned long len, const unsigned char *indata, unsigned char *outdata) = NULL;
-
-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++) {
@@ -77,19 +59,35 @@ static char *configfile_exists(void)
        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 = conf.bufsize_arg, loaded = 0;
 
-
-       if (cmdline_parser(argc, argv, &conf))
+       if (audioc_cmdline_parser(argc, argv, &conf))
                goto out;
+       HANDLE_VERSION_FLAG("audioc", conf);
        cf = configfile_exists();
        if (cf) {
-               if (cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
+               if (audioc_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
                        fprintf(stderr, "parse error in config file\n");
                        exit(EXIT_FAILURE);
                }
@@ -97,7 +95,7 @@ int main(int argc, char *argv[])
        args = conf.inputs_num?
                concat_args(conf.inputs_num, conf.inputs) :
                para_strdup("stat");
-       buf = para_malloc(conf.bufsize_arg);
+       buf = para_malloc(bufsize);
        if (conf.socket_given)
                socket_name = para_strdup(conf.socket_arg);
        else
@@ -121,9 +119,8 @@ int main(int argc, char *argv[])
        ret = - E_AUDIOC_CONNECT;
        if (connect(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX) < 0)
                goto out;
-       fprintf(stderr, "loaded: %d\n", loaded);
-       ret = -E_CREDENTIALS;
-       if (send_cred_buffer(fd, args) < 0)
+       ret = send_cred_buffer(fd, args);
+       if (ret < 0)
                goto out;
        for (;;) {
                int max_fileno = -1, check_write = 0;
@@ -131,9 +128,7 @@ int main(int argc, char *argv[])
                fd_set rfd, wfd;
                FD_ZERO(&rfd);
                FD_ZERO(&wfd);
-               if (loaded && loaded > 10000)
-                       fprintf(stderr, "loaded: %d\n", loaded);
-               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);
@@ -145,9 +140,9 @@ int main(int argc, char *argv[])
                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;