X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fhelper%2Fioutil.c;h=27bffad33687667c298238624616b3b4c0fc9f6f;hb=b58c1d808fcdeb7a751c1ecf4e5512a8943ec263;hp=58521eefbced27dea0be8d0571fa942cb4dbe3ed;hpb=8de1e7bd9eb7f5e1db7ea2f4cb03e73f442a1a12;p=fw%2Fopenocd

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 58521eefb..27bffad33 100644
--- 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)
@@ -421,25 +401,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,13 +617,6 @@ 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,
@@ -685,27 +651,51 @@ static const struct command_registration ioutil_command_handlers[] = {
 		.mode = COMMAND_ANY,
 		.help = "display available ram memory",
 	},
+	{
+		.name = "rm",
+		.mode = COMMAND_ANY,
+		.handler = &handle_rm_command,
+		.help = "remove a file",
+		.usage = "<file>",
+	},
+	// jim handlers
+	{
+		.name = "peek",
+		.mode = COMMAND_ANY,
+		.jim_handler = &zylinjtag_Jim_Command_peek,
+		.help = "peek at a memory address",
+		.usage = "<addr>",
+	},
+	{
+		.name = "poke",
+		.mode = COMMAND_ANY,
+		.jim_handler = &zylinjtag_Jim_Command_poke,
+		.help = "poke at a memory address",
+		.usage = "<addr> <value>",
+	},
+	{
+		.name = "ls",
+		.mode = COMMAND_ANY,
+		.jim_handler = &zylinjtag_Jim_Command_ls,
+		.help = "show a listing of files",
+		.usage = "<dir>",
+	},
+	{
+		.name = "mac",
+		.mode = COMMAND_ANY,
+		.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);
 }
-
-