Simplify para_basename().

[paraslash.git] / audiod_command.c

diff --git a/audiod_command.c b/audiod_command.c
index 77a0a1ee32bb7a1b3241afc549d999f124a6073e..773bba8b07e1e1c06468d79cedb4a7f115aeec42 100644 (file)
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,25 +1,15 @@
 /*
  * Copyright (C) 2005-2007 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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.

  */
 
 /** \file audiod_command.c commands for para_audiod */
 
  */
 
 /** \file audiod_command.c commands for para_audiod */
 

-#include "para.h"
+#include <sys/types.h>
+#include <dirent.h>

 
 

+#include "para.h"

 #include "audiod.cmdline.h"
 #include "list.h"
 #include "close_on_fork.h"
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "close_on_fork.h"


@@ -80,7 +70,7 @@ static char *get_time_string(struct timeval *newest_stime)
                total = 0;
 out:
        return make_message(
                total = 0;
 out:
        return make_message(

-               "%s:%s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
+               "%s: %s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",

                status_item_list[SI_PLAY_TIME],
                use_server_time? "~" : "",
                total / 60,
                status_item_list[SI_PLAY_TIME],
                use_server_time? "~" : "",
                total / 60,


@@ -98,7 +88,7 @@ __malloc static char *audiod_status_string(void)
 {
        const char *status = (audiod_status == AUDIOD_ON)?
                "on" : (audiod_status == AUDIOD_OFF)? "off": "sb";
 {
        const char *status = (audiod_status == AUDIOD_ON)?
                "on" : (audiod_status == AUDIOD_OFF)? "off": "sb";

-       return make_message("%s:%s\n", status_item_list[SI_AUDIOD_STATUS], status);
+       return make_message("%s: %s\n", status_item_list[SI_AUDIOD_STATUS], status);

 }
 
 static struct timeval *wstime(void)
 }
 
 static struct timeval *wstime(void)


@@ -130,7 +120,7 @@ __malloc static char *decoder_flags(void)
                flags[i] = flag;
        }
        flags[MAX_STREAM_SLOTS] = '\0';
                flags[i] = flag;
        }
        flags[MAX_STREAM_SLOTS] = '\0';

-       return make_message("%s:%s\n", status_item_list[SI_DECODER_FLAGS],
+       return make_message("%s: %s\n", status_item_list[SI_DECODER_FLAGS],

                flags);
 }
 
                flags);
 }
 


@@ -247,7 +237,7 @@ int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
        }
        if (mask & (1 << SI_AUDIOD_UPTIME)) {
                char *tmp, *us = uptime_str();
        }
        if (mask & (1 << SI_AUDIOD_UPTIME)) {
                char *tmp, *us = uptime_str();

-               tmp = make_message("%s:%s\n",
+               tmp = make_message("%s: %s\n",

                        status_item_list[SI_AUDIOD_UPTIME], us);
                free(us);
                ret = client_write(fd, tmp);
                        status_item_list[SI_AUDIOD_UPTIME], us);
                free(us);
                ret = client_write(fd, tmp);


@@ -263,14 +253,13 @@ int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
                free(s);
        }
        if (mask & (1 << SI_DECODER_FLAGS)) {
                free(s);
        }
        if (mask & (1 << SI_DECODER_FLAGS)) {

-               char *df =decoder_flags();
+               char *df = decoder_flags();

                ret = client_write(fd, df);
                if (ret < 0)
                        goto out;
                free(df);
        }
                ret = client_write(fd, df);
                if (ret < 0)
                        goto out;
                free(df);
        }

-
-       for (i = 0; i < NUM_STAT_ITEMS; i++) {
+       FOR_EACH_STATUS_ITEM(i) {

                char *tmp, *v;
                if (!((1 << i) & mask))
                        continue;
                char *tmp, *v;
                if (!((1 << i) & mask))
                        continue;


@@ -426,6 +415,7 @@ int handle_connect(int accept_fd)
        int i, argc, ret, clifd = -1;
        char *cmd = NULL, *p, *buf = para_calloc(MAXLINE), **argv = NULL;
        struct sockaddr_un unix_addr;
        int i, argc, ret, clifd = -1;
        char *cmd = NULL, *p, *buf = para_calloc(MAXLINE), **argv = NULL;
        struct sockaddr_un unix_addr;

+       uid_t uid;

 
        ret = para_accept(accept_fd, &unix_addr, sizeof(struct sockaddr_un));
        if (ret < 0)
 
        ret = para_accept(accept_fd, &unix_addr, sizeof(struct sockaddr_un));
        if (ret < 0)


@@ -434,8 +424,9 @@ int handle_connect(int accept_fd)
        ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
        if (ret < 0)
                goto out;
        ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
        if (ret < 0)
                goto out;

+       uid = ret;

        PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
        PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);

-       ret = check_perms(ret);
+       ret = check_perms(uid);

        if (ret < 0)
                goto out;
        ret = -E_INVALID_AUDIOD_CMD;
        if (ret < 0)
                goto out;
        ret = -E_INVALID_AUDIOD_CMD;


@@ -470,7 +461,7 @@ out:
        free(buf);
        free(argv);
        if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {
        free(buf);
        free(argv);
        if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {

-               char *tmp = make_message("%s\n", PARA_STRERROR(-ret));
+               char *tmp = make_message("%s\n", para_strerror(-ret));

                client_write(clifd, tmp);
                free(tmp);
                close(clifd);
                client_write(clifd, tmp);
                free(tmp);
                close(clifd);


@@ -500,7 +491,7 @@ void audiod_status_dump(void)
        old = stat_task->stat_item_values[SI_AUDIOD_UPTIME];
        if (!old || strcmp(old, new)) {
                free(old);
        old = stat_task->stat_item_values[SI_AUDIOD_UPTIME];
        if (!old || strcmp(old, new)) {
                free(old);

-               tmp = make_message("%s:%s\n",
+               tmp = make_message("%s: %s\n",

                        status_item_list[SI_AUDIOD_UPTIME], new);
                stat_client_write(tmp, SI_AUDIOD_UPTIME);
                free(tmp);
                        status_item_list[SI_AUDIOD_UPTIME], new);
                stat_client_write(tmp, SI_AUDIOD_UPTIME);
                free(tmp);


@@ -537,7 +528,7 @@ void dump_empty_status(void)
 {
        int i;
 
 {
        int i;
 

-       FOR_EACH_STAT_ITEM(i) {
+       FOR_EACH_STATUS_ITEM(i) {

                char *tmp = make_message("%s:\n", status_item_list[i]);
                stat_client_write(tmp, i);
                free(tmp);
                char *tmp = make_message("%s:\n", status_item_list[i]);
                stat_client_write(tmp, i);
                free(tmp);