/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 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>
+
#include "audioc.cmdline.h"
#include "para.h"
+#include "error.h"
#include "net.h"
#include "string.h"
#include "fd.h"
-#include "error.h"
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)
{
*/
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();
+ char *cf, *buf = NULL, *args;
size_t bufsize, loaded = 0;
if (audioc_cmdline_parser(argc, argv, &conf))
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(
- "/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 (conf.socket_given) {
+ ret = create_remote_socket(conf.socket_arg);
+ } else {
+ char *hn = para_hostname(),
+ *socket_name = make_message("/var/paraslash/audiod_socket.%s", hn);
+
+ ret = create_remote_socket(socket_name);
+ free(hn);
+ free(socket_name);
+ }
if (ret < 0)
goto out;
fd = ret;
- ret = -E_INIT_SOCK_ADDR;
- if (init_unix_addr(&unix_addr, socket_name) < 0)
+ ret = mark_fd_nonblocking(fd);
+ if (ret < 0)
goto out;
- ret = -E_AUDIOC_CONNECT;
- if (connect(fd, (struct sockaddr *)&unix_addr, UNIX_PATH_MAX) < 0) /* FIXME: Use para_connect() */
+ ret = mark_fd_nonblocking(STDOUT_FILENO);
+ if (ret < 0)
goto out;
ret = send_cred_buffer(fd, args);
if (ret < 0)
goto out;
}
loaded -= ret;
+ if (loaded && ret)
+ memmove(buf, buf + ret, loaded);
}
}
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;
}