gengetopt improvements

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index ee165e88b923efda643fc54845790394741557ed..030289af8444ac35baddb8e10b30712a542768c9 100644 (file)
--- a/command.c
+++ b/command.c
@@ -426,7 +426,7 @@ static char *get_status(struct misc_meta_data *nmmd)
                status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
                status_item_list[SI_STATUS], status,
                status_item_list[SI_STATUS_FLAGS], flags,
                status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
                status_item_list[SI_STATUS], status,
                status_item_list[SI_STATUS_FLAGS], flags,

-               status_item_list[SI_SELECTOR], dblist[nmmd->dbt_num].name,
+               status_item_list[SI_SELECTOR], dblist[nmmd->selector_num].name,

 
                status_item_list[SI_OFFSET], offset,
                status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
 
                status_item_list[SI_OFFSET], offset,
                status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),


@@ -734,8 +734,9 @@ static struct server_command *get_cmd_ptr(char *name, char **handler)
        /* not found, look for commands supported by the current selector */
        mmd_lock();
        if (handler)
        /* not found, look for commands supported by the current selector */
        mmd_lock();
        if (handler)

-               *handler = make_message("the %s selector", dblist[mmd->dbt_num].name);
-       cmd = dblist[mmd->dbt_num].cmd_list;
+               *handler = make_message("the %s selector",
+                       dblist[mmd->selector_num].name);
+       cmd = dblist[mmd->selector_num].cmd_list;

        mmd_unlock();
        for (; cmd->name; cmd++)
                if (!strcmp(cmd->name, name))
        mmd_unlock();
        for (; cmd->name; cmd++)
                if (!strcmp(cmd->name, name))


@@ -755,8 +756,8 @@ static int com_help(int fd, int argc, char **argv)
                if ((ret = send_description(fd, cmd_struct, "server", 0)) < 0)
                        return ret;
                mmd_lock();
                if ((ret = send_description(fd, cmd_struct, "server", 0)) < 0)
                        return ret;
                mmd_lock();

-               handler = para_strdup(dblist[mmd->dbt_num].name);
-               cmd = dblist[mmd->dbt_num].cmd_list;
+               handler = para_strdup(dblist[mmd->selector_num].name);
+               cmd = dblist[mmd->selector_num].cmd_list;

                mmd_unlock();
                ret = send_description(fd, cmd, handler, 0);
                free(handler);
                mmd_unlock();
                ret = send_description(fd, cmd, handler, 0);
                free(handler);


@@ -854,7 +855,7 @@ static int com_chs(int fd, int argc, char **argv)
        if (!argc) {
                char *selector;
                mmd_lock();
        if (!argc) {
                char *selector;
                mmd_lock();

-               selector = para_strdup(dblist[mmd->dbt_num].name);
+               selector = para_strdup(dblist[mmd->selector_num].name);

                mmd_unlock();
                ret = send_va_buffer(fd, "%s\n", selector);
                free(selector);
                mmd_unlock();
                ret = send_va_buffer(fd, "%s\n", selector);
                free(selector);


@@ -864,7 +865,7 @@ static int com_chs(int fd, int argc, char **argv)
                if (strcmp(dblist[i].name, argv[1]))
                        continue;
                mmd_lock();
                if (strcmp(dblist[i].name, argv[1]))
                        continue;
                mmd_lock();

-               mmd->dbt_change = i;
+               mmd->selector_change = i;

                mmd->events++;
                mmd_unlock();
                return 1;
                mmd->events++;
                mmd_unlock();
                return 1;


@@ -878,6 +879,7 @@ static int com_next(__unused int socket_fd, int argc, __unused char **argv)
        if (argc)
                return -E_COMMAND_SYNTAX;
        mmd_lock();
        if (argc)
                return -E_COMMAND_SYNTAX;
        mmd_lock();

+       mmd->events++;

        mmd->new_afs_status_flags |= AFS_NEXT;
        mmd_unlock();
        return 1;
        mmd->new_afs_status_flags |= AFS_NEXT;
        mmd_unlock();
        return 1;


@@ -1203,7 +1205,6 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        /* valid command and sufficient perms */
        alarm(0);
        argc = split_args(command, &argv, '\n');
        /* valid command and sufficient perms */
        alarm(0);
        argc = split_args(command, &argv, '\n');

-       argv[0] = cmd->name;

        mmd_lock();
        mmd->num_commands++;
        mmd_unlock();
        mmd_lock();
        mmd->num_commands++;
        mmd_unlock();