sender: Deplete ACLs on exit.

[paraslash.git] / audioc.c

diff --git a/audioc.c b/audioc.c
index f2e20bab468a42c14fdba8e72e7165f7e1c6b30e..77a0539d2e4513a2e9cc3f926e303f264d08d3b8 100644 (file)
--- a/audioc.c
+++ b/audioc.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file audioc.c The client program used to connect to para_audiod. */
 
@@ -116,7 +112,7 @@ static void version_completer(struct i9e_completion_info *ci,
 static void stat_completer(struct i9e_completion_info *ci,
                struct i9e_completion_result *cr)
 {
-       char *sia[] = {STATUS_ITEM_ARRAY NULL};
+       char *sia[] = {STATUS_ITEMS NULL};
        char *opts[] = {LSG_AUDIOD_CMD_STAT_OPTS, NULL};
 
        if (ci->word_num <= 2 && ci->word && ci->word[0] == '-')
@@ -132,7 +128,6 @@ static void grab_completer(struct i9e_completion_info *ci,
        i9e_complete_option(opts, ci, cr);
 }
 
-I9E_DUMMY_COMPLETER(SUPERCOMMAND_UNAVAILABLE);
 static struct i9e_completer audiod_completers[] = {
 #define LSG_AUDIOD_CMD_CMD(_name) {.name = #_name, \
        .completer = _name ## _completer}
@@ -200,7 +195,7 @@ static int audioc_i9e_line_handler(char *line)
        ret = connect_audiod(socket_name, args);
        free(args);
        if (ret < 0)
-               goto out;
+               return ret;
        at->fd = ret;
        ret = mark_fd_nonblocking(at->fd);
        if (ret < 0)
@@ -217,8 +212,6 @@ static int audioc_i9e_line_handler(char *line)
        return 1;
 close:
        close(at->fd);
-out:
-       free(args);
        return ret;
 }
 
@@ -294,12 +287,11 @@ __noreturn static void print_completions(void)
 static char *configfile_exists(void)
 {
        char *config_file;
-       struct stat statbuf;
        char *home = para_homedir();
 
        config_file = make_message("%s/.paraslash/audioc.conf", home);
        free(home);
-       if (!stat(config_file, &statbuf))
+       if (file_exists(config_file))
                return config_file;
        free(config_file);
        return NULL;
@@ -334,7 +326,7 @@ static void handle_help_flag(void)
  *
  * \return EXIT_SUCCESS or EXIT_FAILURE.
  *
- * \sa send_cred_buffer(), para_audioc(1), para_audiod(1).
+ * \sa \ref send_cred_buffer(), para_audioc(1), para_audiod(1).
  */
 int main(int argc, char *argv[])
 {