Change the type of the argv argument of all commands.

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 69983c3f13ac155909d2e4fb84ce53b62a51711d..1c1b300f2bb0352142f2745ef764077b0bfcf3f2 100644 (file)
--- a/command.c
+++ b/command.c
@@ -1,26 +1,17 @@
 /*
  * Copyright (C) 1997-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 command.c does client authentication and executes server commands */
 
 #include <sys/time.h> /* gettimeofday */
+#include "para.h" /* gettimeofday */
+
 #include "server.cmdline.h"
-#include "afs.h"
+#include "afs_common.h"
+#include "afh.h"
 #include "server.h"
 #include "vss.h"
 #include "send.h"
@@ -31,8 +22,10 @@
 #include "daemon.h"
 #include "string.h"
 #include "fd.h"
+#include "list.h"
 #include "user_list.h"
 #include "server_command_list.h"
+#include "afs_command_list.h"
 
 /** commands including options must be shorter than this */
 #define MAX_COMMAND_LEN 4096
@@ -186,7 +179,7 @@ static char *get_status(struct misc_meta_data *nmmd)
        return ret;
 }
 
-static int check_sender_args(int argc, char **argv, struct sender_command_data *scd)
+static int check_sender_args(int argc, char * const * argv, struct sender_command_data *scd)
 {
        int i;
        /* this has to match sender.h */
@@ -252,7 +245,7 @@ static int check_sender_args(int argc, char **argv, struct sender_command_data *
        return 1;
 }
 
-int com_sender(int fd, int argc, char **argv)
+int com_sender(int fd, int argc, char * const * argv)
 {
        int i, ret;
        struct sender_command_data scd;
@@ -294,7 +287,7 @@ int com_sender(int fd, int argc, char **argv)
 }
 
 /* server info */
-int com_si(int fd, int argc, __a_unused char **argv)
+int com_si(int fd, int argc, __a_unused char * const * argv)
 {
        int i, ret;
        char *ut;
@@ -343,7 +336,7 @@ int com_si(int fd, int argc, __a_unused char **argv)
 }
 
 /* version */
-int com_version(int fd, int argc, __a_unused char **argv)
+int com_version(int fd, int argc, __a_unused char * const * argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
@@ -354,7 +347,7 @@ int com_version(int fd, int argc, __a_unused char **argv)
 }
 
 /* sc */
-int com_sc(int fd, int argc, char **argv)
+int com_sc(int fd, int argc, char * const * argv)
 {
        char *name = NULL;
        int ret, old = 0, count = -1; /* print af change forever */
@@ -382,7 +375,7 @@ repeat:
 }
 
 /* sb */
-int com_sb(int fd, int argc, char **argv)
+int com_sb(int fd, int argc, char * const * argv)
 {
        char *sb;
        int ret, nr = -1;       /* status bar will be printed that many
@@ -409,7 +402,7 @@ int com_sb(int fd, int argc, char **argv)
 }
 
 /* stat */
-int com_stat(int fd, int argc, char **argv)
+int com_stat(int fd, int argc, char * const * argv)
 {
        int ret, num = 0;/* status will be printed that many
                          * times. num <= 0 means: print forever
@@ -459,7 +452,7 @@ static int send_list_of_commands(int fd, struct server_command *cmd,
 }
 
 /* always returns string that must be freed by the caller in handler */
-static struct server_command *get_cmd_ptr(char *name, char **handler)
+static struct server_command *get_cmd_ptr(const char *name, char **handler)
 {
        struct server_command *cmd;
 
@@ -479,11 +472,15 @@ static struct server_command *get_cmd_ptr(char *name, char **handler)
        for (; cmd->name; cmd++)
                if (!strcmp(cmd->name, name))
                        return cmd;
+       /* not found, look for commands supported by afs */
+       for (cmd = afs_cmds; cmd; cmd++)
+               if (!strcmp(cmd->name, name))
+                       return cmd;
        return NULL;
 }
 
 /* help */
-int com_help(int fd, int argc, char **argv)
+int com_help(int fd, int argc, char * const * argv)
 {
        struct server_command *cmd;
        char *perms, *handler;
@@ -499,7 +496,10 @@ int com_help(int fd, int argc, char **argv)
                mmd_unlock();
                ret = send_list_of_commands(fd, cmd, handler);
                free(handler);
-               return ret;
+               if (ret < 0)
+                       return ret;
+               cmd = afs_cmds;
+               ret = send_list_of_commands(fd, cmd, "afs");
        }
        /* argument given for help */
        cmd = get_cmd_ptr(argv[1], &handler);
@@ -527,7 +527,7 @@ int com_help(int fd, int argc, char **argv)
 }
 
 /* hup */
-int com_hup(__a_unused int fd, int argc, __a_unused char **argv)
+int com_hup(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
@@ -536,7 +536,7 @@ int com_hup(__a_unused int fd, int argc, __a_unused char **argv)
 }
 
 /* term */
-int com_term(__a_unused int fd, int argc, __a_unused char **argv)
+int com_term(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
@@ -544,7 +544,7 @@ int com_term(__a_unused int fd, int argc, __a_unused char **argv)
        return 1;
 }
 
-int com_play(__a_unused int fd, int argc, __a_unused char **argv)
+int com_play(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
@@ -557,7 +557,7 @@ int com_play(__a_unused int fd, int argc, __a_unused char **argv)
 }
 
 /* stop */
-int com_stop(__a_unused int fd, int argc, __a_unused char **argv)
+int com_stop(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
@@ -570,7 +570,7 @@ int com_stop(__a_unused int fd, int argc, __a_unused char **argv)
 }
 
 /* pause */
-int com_pause(__a_unused int fd, int argc, __a_unused char **argv)
+int com_pause(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
@@ -583,7 +583,7 @@ int com_pause(__a_unused int fd, int argc, __a_unused char **argv)
        return 1;
 }
 
-int com_chs(int fd, int argc, char **argv)
+int com_chs(int fd, int argc, char * const * argv)
 {
        int i, ret;
 
@@ -609,7 +609,7 @@ int com_chs(int fd, int argc, char **argv)
 }
 
 /* next */
-int com_next(__a_unused int fd, int argc, __a_unused char **argv)
+int com_next(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
@@ -621,7 +621,7 @@ int com_next(__a_unused int fd, int argc, __a_unused char **argv)
 }
 
 /* nomore */
-int com_nomore(__a_unused int fd, int argc, __a_unused char **argv)
+int com_nomore(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
@@ -633,7 +633,7 @@ int com_nomore(__a_unused int fd, int argc, __a_unused char **argv)
 }
 
 /* ff */
-int com_ff(__a_unused int fd, int argc, char **argv)
+int com_ff(__a_unused int fd, int argc, char * const * argv)
 {
        long promille;
        int ret, backwards = 0;
@@ -672,7 +672,7 @@ out:
 }
 
 /* jmp */
-int com_jmp(__a_unused int fd, int argc, char **argv)
+int com_jmp(__a_unused int fd, int argc, char * const * argv)
 {
        long unsigned int i;
        int ret;