X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fioutil.c;h=ed82ba1cd78fa823476b2ab8cea0dd7d530fad21;hp=3a62961142d7d6556d7c8416b60d352d0a201540;hb=2da2864632c281a2523f924b406e532d610857a6;hpb=d22270e0ed291d3b08fd03a25181b279ca5e0911 diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c index 3a62961142..ed82ba1cd7 100644 --- a/src/helper/ioutil.c +++ b/src/helper/ioutil.c @@ -38,9 +38,6 @@ #ifdef HAVE_NET_IF_H #include #endif -//#ifdef HAVE_NETINET_TCP_H -//#include -//#endif #ifdef HAVE_SYS_IOCTL_H #include #endif @@ -57,23 +54,6 @@ #endif -COMMAND_HANDLER(handle_rm_command) -{ - if (argc != 1) - { - command_print(cmd_ctx, "rm "); - return ERROR_INVALID_ARGUMENTS; - } - - if (unlink(args[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) @@ -135,9 +115,9 @@ int loadFile(const char *fileName, void **data, size_t *len) COMMAND_HANDLER(handle_cat_command) { - if (argc != 1) + if (CMD_ARGC != 1) { - command_print(cmd_ctx, "cat "); + command_print(CMD_CTX, "cat "); return ERROR_INVALID_ARGUMENTS; } @@ -145,15 +125,15 @@ COMMAND_HANDLER(handle_cat_command) void *data; size_t len; - int retval = loadFile(args[0], &data, &len); + int retval = loadFile(CMD_ARGV[0], &data, &len); if (retval == ERROR_OK) { - command_print(cmd_ctx, "%s", (char *)data); + command_print(CMD_CTX, "%s", (char *)data); free(data); } else { - command_print(cmd_ctx, "%s not found %d", args[0], retval); + command_print(CMD_CTX, "%s not found %d", CMD_ARGV[0], retval); } return ERROR_OK; @@ -161,14 +141,14 @@ COMMAND_HANDLER(handle_cat_command) COMMAND_HANDLER(handle_trunc_command) { - if (argc != 1) + if (CMD_ARGC != 1) { - command_print(cmd_ctx, "trunc "); + command_print(CMD_CTX, "trunc "); return ERROR_INVALID_ARGUMENTS; } FILE *config_file = NULL; - config_file = fopen(args[0], "w"); + config_file = fopen(CMD_ARGV[0], "w"); if (config_file != NULL) fclose(config_file); @@ -180,9 +160,9 @@ COMMAND_HANDLER(handle_meminfo_command) static int prev = 0; struct mallinfo info; - if (argc != 0) + if (CMD_ARGC != 0) { - command_print(cmd_ctx, "meminfo"); + command_print(CMD_CTX, "meminfo"); return ERROR_INVALID_ARGUMENTS; } @@ -190,11 +170,11 @@ COMMAND_HANDLER(handle_meminfo_command) if (prev > 0) { - command_print(cmd_ctx, "Diff: %d", prev - info.fordblks); + command_print(CMD_CTX, "Diff: %d", prev - info.fordblks); } prev = info.fordblks; - command_print(cmd_ctx, "Available ram: %d", info.fordblks); + command_print(CMD_CTX, "Available ram: %d", info.fordblks); return ERROR_OK; } @@ -202,32 +182,32 @@ COMMAND_HANDLER(handle_meminfo_command) COMMAND_HANDLER(handle_append_command) { - if (argc < 1) + if (CMD_ARGC < 1) { - command_print(cmd_ctx, + command_print(CMD_CTX, "append [, [, ...]]"); return ERROR_INVALID_ARGUMENTS; } int retval = ERROR_FAIL; FILE *config_file = NULL; - config_file = fopen(args[0], "a"); + config_file = fopen(CMD_ARGV[0], "a"); if (config_file != NULL) { fseek(config_file, 0, SEEK_END); unsigned i; - for (i = 1; i < argc; i++) + for (i = 1; i < CMD_ARGC; i++) { - if (fwrite(args[i], 1, strlen(args[i]), config_file) != strlen(args[i])) + if (fwrite(CMD_ARGV[i], 1, strlen(CMD_ARGV[i]), config_file) != strlen(CMD_ARGV[i])) break; - if (i != argc - 1) + if (i != CMD_ARGC - 1) { if (fwrite(" ", 1, 1, config_file) != 1) break; } } - if ((i == argc) && (fwrite("\n", 1, 1, config_file) == 1)) + if ((i == CMD_ARGC) && (fwrite("\n", 1, 1, config_file) == 1)) { retval = ERROR_OK; } @@ -241,7 +221,7 @@ COMMAND_HANDLER(handle_append_command) COMMAND_HANDLER(handle_cp_command) { - if (argc != 2) + if (CMD_ARGC != 2) { return ERROR_INVALID_ARGUMENTS; } @@ -250,11 +230,11 @@ COMMAND_HANDLER(handle_cp_command) void *data; size_t len; - int retval = loadFile(args[0], &data, &len); + int retval = loadFile(CMD_ARGV[0], &data, &len); if (retval != ERROR_OK) return retval; - FILE *f = fopen(args[1], "wb"); + FILE *f = fopen(CMD_ARGV[1], "wb"); if (f == NULL) retval = ERROR_INVALID_ARGUMENTS; @@ -276,7 +256,7 @@ COMMAND_HANDLER(handle_cp_command) break; } - command_print(cmd_ctx, "%zu", len - pos); + command_print(CMD_CTX, "%zu", len - pos); pos += chunk; @@ -286,10 +266,10 @@ COMMAND_HANDLER(handle_cp_command) if (retval == ERROR_OK) { - command_print(cmd_ctx, "Copied %s to %s", args[0], args[1]); + command_print(CMD_CTX, "Copied %s to %s", CMD_ARGV[0], CMD_ARGV[1]); } else { - command_print(cmd_ctx, "Failed: %d", retval); + command_print(CMD_CTX, "Failed: %d", retval); } if (data != NULL) @@ -298,7 +278,7 @@ COMMAND_HANDLER(handle_cp_command) fclose(f); if (retval != ERROR_OK) - unlink(args[1]); + unlink(CMD_ARGV[1]); return retval; } @@ -643,41 +623,86 @@ static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc, } - - -int ioutil_init(struct command_context_s *cmd_ctx) +static const struct command_registration ioutil_command_handlers[] = { + { + .name = "cat", + .handler = &handle_cat_command, + .mode = COMMAND_ANY, + .help = "display file content", + .usage= "", + }, + { + .name = "trunc", + .handler = &handle_trunc_command, + .mode = COMMAND_ANY, + .help = "truncate a file 0 size", + .usage= "", + }, + { + .name = "cp", + .handler = &handle_cp_command, + .mode = COMMAND_ANY, + .help = "copy a file", + .usage = " ", + }, + { + .name = "append_file", + .handler = &handle_append_command, + .mode = COMMAND_ANY, + .help = "append a variable number of strings to a file", + .usage= " [ ...]", + }, + { + .name = "meminfo", + .handler = &handle_meminfo_command, + .mode = COMMAND_ANY, + .help = "display available ram memory", + }, + // jim handlers + { + .name = "rm", + .mode = COMMAND_ANY, + .jim_handler = &zylinjtag_Jim_Command_rm, + .help = "remove a file", + .usage = "", + }, + { + .name = "peek", + .mode = COMMAND_ANY, + .jim_handler = &zylinjtag_Jim_Command_peek, + .help = "peek at a memory address", + .usage = "", + }, + { + .name = "poke", + .mode = COMMAND_ANY, + .jim_handler = &zylinjtag_Jim_Command_poke, + .help = "poke at a memory address", + .usage = " ", + }, + { + .name = "ls", + .mode = COMMAND_ANY, + .jim_handler = &zylinjtag_Jim_Command_ls, + .help = "show a listing of files", + .usage = "", + }, + { + .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_command(cmd_ctx, NULL, "rm", handle_rm_command, COMMAND_ANY, - "remove file"); - - register_command(cmd_ctx, NULL, "cat", handle_cat_command, COMMAND_ANY, - "display file content"); - - register_command(cmd_ctx, NULL, "trunc", handle_trunc_command, COMMAND_ANY, - "truncate a file to 0 size"); - - register_command(cmd_ctx, NULL, "cp", handle_cp_command, - COMMAND_ANY, "copy a file "); - - register_command(cmd_ctx, NULL, "append_file", handle_append_command, - COMMAND_ANY, "append a variable number of strings to a file"); - - register_command(cmd_ctx, NULL, "meminfo", handle_meminfo_command, - COMMAND_ANY, "display available ram memory"); - - 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); } - -