Makefile: Remove oggdec_filter from $all_ggos.

[paraslash.git] / audioc.c

diff --git a/audioc.c b/audioc.c
index 66ff2a267dc5228056cce913055afc177f9c6560..f91f41ffc99e004ff8468000f6579ee045265ff8 100644 (file)
--- 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)
 {
@@ -67,11 +69,9 @@ static char *configfile_exists(void)
  */
 int main(int argc, char *argv[])
 {
-       struct sockaddr_un unix_addr;
        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;
+       char *cf, *buf = NULL, *args;
+       size_t bufsize;
 
        if (audioc_cmdline_parser(argc, argv, &conf))
                goto out;
@@ -89,78 +89,38 @@ 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");
-       bufsize = conf.bufsize_arg;
-       buf = para_malloc(bufsize);
+
        if (conf.socket_given)
-               socket_name = para_strdup(conf.socket_arg);
-       else
-               socket_name = make_message(
+               ret = create_remote_socket(conf.socket_arg);
+       else {
+               char *hn = para_hostname(), *socket_name = make_message(
                        "/var/paraslash/audiod_socket.%s", hn);
-       if (conf.tmpdir_given)
-               tmpsocket_name = make_message("%s/audioc.sock.%s.%s",
-                       conf.tmpdir_arg, hn, randname);
-       else
-               tmpsocket_name = make_message("%s/.paraslash/audioc_sock.%s.%s",
-                       home, hn, randname);
-
-       ret = create_local_socket(tmpsocket_name, &unix_addr, S_IRUSR | S_IWUSR);
-       unlink(tmpsocket_name);
-       free(tmpsocket_name);
-       if (ret < 0)
+               ret = create_remote_socket(socket_name);
+               free(hn);
+               free(socket_name);
+       }
+       if (ret < 0) {
+               PARA_EMERG_LOG("failed to create remote socket\n");
                goto out;
+       }
        fd = ret;
-       ret = -E_INIT_SOCK_ADDR;
-       if (init_unix_addr(&unix_addr, socket_name) < 0)
-               goto out;
-       ret = PARA_CONNECT(fd, &unix_addr);
-       if (ret < 0)
-               goto out;
        ret = send_cred_buffer(fd, args);
        if (ret < 0)
                goto out;
-       for (;;) {
-               int max_fileno = -1, check_write = 0;
-               ssize_t len;
-               fd_set rfd, wfd;
-               FD_ZERO(&rfd);
-               FD_ZERO(&wfd);
-               if (loaded < bufsize)
-                       para_fd_set(fd, &rfd, &max_fileno);
-               if (loaded > 0) {
-                       para_fd_set(STDOUT_FILENO, &wfd, &max_fileno);
-                       check_write = 1;
-               }
-               ret = -E_AUDIOC_OVERRUN;
-               if (max_fileno < 0)
-                       goto out;
-               ret = para_select(max_fileno + 1, &rfd, &wfd, NULL);
-               if (ret < 0)
-                       goto out;
-               if (loaded < bufsize && FD_ISSET(fd, &rfd)) {
-                       len = recv_bin_buffer(fd, buf + loaded,
-                               bufsize - loaded);
-                       if (len <= 0) {
-                               ret = len < 0? -E_AUDIOC_READ : 0;
-                               goto out;
-                       }
-                       loaded += len;
-               }
-               if (check_write && FD_ISSET(STDOUT_FILENO, &wfd)) {
-                       ret = write(STDOUT_FILENO, buf, loaded);
-                       if (ret < 0) {
-                               ret = -E_AUDIOC_WRITE;
-                               goto out;
-                       }
-                       loaded -= ret;
-               }
-       }
+       bufsize = conf.bufsize_arg;
+       buf = para_malloc(bufsize);
+       do {
+               size_t n = ret = recv_bin_buffer(fd, buf, bufsize);
+               if (ret <= 0)
+                       break;
+               ret = write_all(STDOUT_FILENO, buf, &n);
+       } while (ret >= 0);
 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;
 }