jim: more jim -Wshadow fixes that should be straightforward

[openocd.git] / src / helper / ioutil.c

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 58521eefbced27dea0be8d0571fa942cb4dbe3ed..14f6e91dbb4685de4c4be687d6380cc3dda2df67 100644 (file)
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -38,9 +38,6 @@
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
-//#ifdef HAVE_NETINET_TCP_H
-//#include <netinet/tcp.h>
-//#endif
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
@@ -57,23 +54,6 @@
 #endif
 
 
-COMMAND_HANDLER(handle_rm_command)
-{
-       if (CMD_ARGC != 1)
-       {
-               command_print(CMD_CTX, "rm <filename>");
-               return ERROR_INVALID_ARGUMENTS;
-       }
-
-       if (unlink(CMD_ARGV[0]) != 0)
-       {
-               command_print(CMD_CTX, "failed: %d", errno);
-       }
-
-       return ERROR_OK;
-}
-
-
 /* loads a file and returns a pointer to it in memory. The file contains
  * a 0 byte(sentinel) after len bytes - the length of the file. */
 int loadFile(const char *fileName, void **data, size_t *len)
@@ -211,6 +191,7 @@ COMMAND_HANDLER(handle_append_command)
 
        int retval = ERROR_FAIL;
        FILE *config_file = NULL;
+
        config_file = fopen(CMD_ARGV[0], "a");
        if (config_file != NULL)
        {
@@ -219,7 +200,8 @@ COMMAND_HANDLER(handle_append_command)
                unsigned i;
                for (i = 1; i < CMD_ARGC; i++)
                {
-                       if (fwrite(CMD_ARGV[i], 1, strlen(CMD_ARGV[i]), config_file) != strlen(CMD_ARGV[i]))
+                       if (fwrite(CMD_ARGV[i], 1, strlen(CMD_ARGV[i]),
+                                       config_file) != strlen(CMD_ARGV[i]))
                                break;
                        if (i != CMD_ARGC - 1)
                        {
@@ -228,9 +210,8 @@ COMMAND_HANDLER(handle_append_command)
                        }
                }
                if ((i == CMD_ARGC) && (fwrite("\n", 1, 1, config_file) == 1))
-               {
                        retval = ERROR_OK;
-               }
+
                fclose(config_file);
        }
 
@@ -421,25 +402,18 @@ void copydir(char *name, char *destdir)
 
 
 
-static int
-zylinjtag_Jim_Command_rm(Jim_Interp *interp,
-                                   int argc,
-               Jim_Obj * const *argv)
+COMMAND_HANDLER(handle_rm_command)
 {
-       int del;
-       if (argc != 2)
-       {
-               Jim_WrongNumArgs(interp, 1, argv, "rm ?dirorfile?");
-               return JIM_ERR;
-       }
+       if (CMD_ARGC != 1)
+               return ERROR_INVALID_ARGUMENTS;
 
-       del = 0;
-       if (unlink(Jim_GetString(argv[1], NULL)) == 0)
-               del = 1;
-       if (rmdir(Jim_GetString(argv[1], NULL)) == 0)
-               del = 1;
+       bool del = false;
+       if (rmdir(CMD_ARGV[0]) == 0)
+               del = true;
+       else if (unlink(CMD_ARGV[0]) == 0)
+               del = true;
 
-       return del ? JIM_OK : JIM_ERR;
+       return del ? ERROR_OK : ERROR_FAIL;
 }
 
 
@@ -644,68 +618,95 @@ static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc,
 }
 
 static const struct command_registration ioutil_command_handlers[] = {
-       {
-               .name = "rm",
-               .handler = &handle_rm_command,
-               .mode = COMMAND_ANY,
-               .help = "remove file",
-               .usage= "<file_name>",
-       },
        {
                .name = "cat",
-               .handler = &handle_cat_command,
+               .handler = handle_cat_command,
                .mode = COMMAND_ANY,
-               .help = "display file content",
-               .usage= "<file_name>",
+               .help = "display text file content",
+               .usage= "file_name",
        },
        {
                .name = "trunc",
-               .handler = &handle_trunc_command,
+               .handler = handle_trunc_command,
                .mode = COMMAND_ANY,
-               .help = "truncate a file 0 size",
-               .usage= "<file_name>",
+               .help = "truncate a file to zero length",
+               .usage= "file_name",
        },
        {
                .name = "cp",
-               .handler = &handle_cp_command,
+               .handler = handle_cp_command,
                .mode = COMMAND_ANY,
                .help = "copy a file",
-               .usage = "<src> <dst>",
+               .usage = "src_file_name dst_file_name",
        },
        {
                .name = "append_file",
-               .handler = &handle_append_command,
+               .handler = handle_append_command,
                .mode = COMMAND_ANY,
                .help = "append a variable number of strings to a file",
-               .usage= "<file_name> [<string> ...]",
+               .usage= "file_name [string ...]",
        },
        {
                .name = "meminfo",
-               .handler = &handle_meminfo_command,
+               .handler = handle_meminfo_command,
+               .mode = COMMAND_ANY,
+               .help = "display free heap space",
+       },
+       {
+               .name = "rm",
+               .mode = COMMAND_ANY,
+               .handler = handle_rm_command,
+               .help = "remove a directory or file",
+               .usage = "file_name",
+       },
+
+       /*
+        * REVISIT shouldn't most, or all, these zylinjtag_*()
+        * entries be #ifdef ZY1000?  If not, why so they have
+        * those names?
+        *
+        * Peek and poke are security holes -- they manipulate
+        * server-internal addresses.
+        */
+
+       // jim handlers
+       {
+               .name = "peek",
+               .mode = COMMAND_ANY,
+               .jim_handler = zylinjtag_Jim_Command_peek,
+               .help = "peek at a memory address",
+               .usage = "address",
+       },
+       {
+               .name = "poke",
+               .mode = COMMAND_ANY,
+               .jim_handler = zylinjtag_Jim_Command_poke,
+               .help = "poke at a memory address",
+               .usage = "address value",
+       },
+       {
+               .name = "ls",
+               .mode = COMMAND_ANY,
+               .jim_handler = zylinjtag_Jim_Command_ls,
+               .help = "show a listing of files",
+               .usage = "dirname",
+       },
+       {
+               .name = "mac",
                .mode = COMMAND_ANY,
-               .help = "display available ram memory",
+               .jim_handler = zylinjtag_Jim_Command_mac,
+               .help = "show MAC address",
+       },
+       {
+               .name = "ip",
+               .jim_handler = zylinjtag_Jim_Command_ip,
+               .mode = COMMAND_ANY,
+               .help = "show IP address",
        },
        COMMAND_REGISTRATION_DONE
 };
 
-
 int ioutil_init(struct command_context *cmd_ctx)
 {
-       register_commands(cmd_ctx, NULL, ioutil_command_handlers);
-
-    Jim_CreateCommand(interp, "rm", zylinjtag_Jim_Command_rm, NULL, NULL);
-
-    Jim_CreateCommand(interp, "peek", zylinjtag_Jim_Command_peek, NULL, NULL);
-    Jim_CreateCommand(interp, "poke", zylinjtag_Jim_Command_poke, NULL, NULL);
-    Jim_CreateCommand(interp, "ls", zylinjtag_Jim_Command_ls, NULL, NULL);
-
-       Jim_CreateCommand(interp, "mac", zylinjtag_Jim_Command_mac,
-                       NULL, NULL);
-
-       Jim_CreateCommand(interp, "ip", zylinjtag_Jim_Command_ip,
-                       NULL, NULL);
-
-    return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, ioutil_command_handlers);
 }
-
-