audioc: use the error subsystem

[paraslash.git] / audioc.c

diff --git a/audioc.c b/audioc.c
index 7d472a6de5475c1eb524dab4bb3dacca64766301..afff14a18b9427fdbbf8ef3b0a4104b12cf9246f 100644 (file)
--- a/audioc.c
+++ b/audioc.c
@@ -23,14 +23,27 @@
 #include "net.h"
 #include "string.h"
 #include "fd.h"
+#include "error.h"
+
+INIT_AUDIOC_ERRLISTS;
 
 struct gengetopt_args_info conf;
 char *tmpfifo;
-enum {E_SYNTAX, E_READ, E_WRITE, E_SOCKET, E_INIT_SOCK_ADDR, E_CONNECT, E_CREDENTIALS, E_SELECT, E_OVERRUN};
 
 
-void para_log(__a_unused int ll, __a_unused const char* fmt,...) /* no logging */
+/*
+ * 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 */
@@ -67,7 +80,7 @@ static char *configfile_exists(void)
 int main(int argc, char *argv[])
 {
        struct sockaddr_un unix_addr;
-       int ret = -E_SYNTAX, fd, loaded = 0;
+       int ret = -E_AUDIOC_SYNTAX, fd, loaded = 0;
        char *cf, *socket_name, *randname = para_tmpname(), *tmpsocket_name = NULL,
                *buf = NULL, *hn = para_hostname(), *args, *home = para_homedir();
 
@@ -97,17 +110,18 @@ int main(int argc, char *argv[])
                tmpsocket_name = make_message("%s/.paraslash/audioc_sock.%s.%s",
                        home, hn, randname);
 
-       ret = -E_SOCKET;
-       fd = create_pf_socket(tmpsocket_name, &unix_addr, S_IRUSR | S_IWUSR);
+       ret = create_pf_socket(tmpsocket_name, &unix_addr, S_IRUSR | S_IWUSR);
        unlink(tmpsocket_name);
-       if (fd < 0)
+       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_CONNECT;
+       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)
                goto out;
@@ -125,19 +139,17 @@ int main(int argc, char *argv[])
                        para_fd_set(STDOUT_FILENO, &wfd, &max_fileno);
                        check_write = 1;
                }
-               ret = -E_OVERRUN;
+               ret = -E_AUDIOC_OVERRUN;
                if (max_fileno < 0)
                        goto out;
                ret = para_select(max_fileno + 1, &rfd, &wfd, NULL);
-               if (ret < 0) {
-                       ret = -E_SELECT;
+               if (ret < 0)
                        goto out;
-               }
                if (loaded < conf.bufsize_arg && FD_ISSET(fd, &rfd)) {
                        len = recv_bin_buffer(fd, buf + loaded,
                                conf.bufsize_arg - loaded);
                        if (len <= 0) {
-                               ret = len < 0? -E_READ : 0;
+                               ret = len < 0? -E_AUDIOC_READ : 0;
                                goto out;
                        }
                        loaded += len;
@@ -145,7 +157,7 @@ int main(int argc, char *argv[])
                if (check_write && FD_ISSET(STDOUT_FILENO, &wfd)) {
                        ret = write(STDOUT_FILENO, buf, loaded);
                        if (ret < 0) {
-                               ret = -E_WRITE;
+                               ret = -E_AUDIOC_WRITE;
                                goto out;
                        }
                        loaded -= ret;
@@ -154,5 +166,7 @@ int main(int argc, char *argv[])
 out:
        if (!ret && loaded && buf)
                ret = write(STDOUT_FILENO, buf, loaded);
-       return ret < 0? -ret : EXIT_SUCCESS;
+       if (ret < 0)
+               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+       return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }