/***************************************************************************
- * Copyright (C) 2007-2008 by Øyvind Harboe *
+ * Copyright (C) 2007-2010 by Øyvind Harboe *
* *
* 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 *
pFile = fopen(fileName,"rb");
if (pFile == NULL)
{
- LOG_ERROR("Can't open %s\n", fileName);
+ LOG_ERROR("Can't open %s", fileName);
return ERROR_FAIL;
}
if (fseek(pFile, 0, SEEK_END) != 0)
{
- LOG_ERROR("Can't open %s\n", fileName);
+ LOG_ERROR("Can't open %s", fileName);
fclose(pFile);
return ERROR_FAIL;
}
long fsize = ftell(pFile);
if (fsize == -1)
{
- LOG_ERROR("Can't open %s\n", fileName);
+ LOG_ERROR("Can't open %s", fileName);
fclose(pFile);
return ERROR_FAIL;
}
if (fseek(pFile, 0, SEEK_SET) != 0)
{
- LOG_ERROR("Can't open %s\n", fileName);
+ LOG_ERROR("Can't open %s", fileName);
fclose(pFile);
return ERROR_FAIL;
}
*data = malloc(*len + 1);
if (*data == NULL)
{
- LOG_ERROR("Can't open %s\n", fileName);
+ LOG_ERROR("Can't open %s", fileName);
fclose(pFile);
return ERROR_FAIL;
}
{
fclose(pFile);
free(*data);
- LOG_ERROR("Can't open %s\n", fileName);
+ LOG_ERROR("Can't open %s", fileName);
return ERROR_FAIL;
}
fclose(pFile);
{
if (CMD_ARGC != 1)
{
- command_print(CMD_CTX, "cat <filename>");
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
// NOTE!!! we only have line printing capability so we print the entire file as a single line.
}
else
{
- command_print(CMD_CTX, "%s not found %d", CMD_ARGV[0], retval);
+ command_print(CMD_CTX, "%s not found", CMD_ARGV[0]);
}
return ERROR_OK;
{
if (CMD_ARGC != 1)
{
- command_print(CMD_CTX, "trunc <filename>");
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
FILE *config_file = NULL;
if (CMD_ARGC != 0)
{
- command_print(CMD_CTX, "meminfo");
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
info = mallinfo();
{
if (CMD_ARGC < 1)
{
- command_print(CMD_CTX,
- "append <filename> [<string1>, [<string2>, ...]]");
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
int retval = ERROR_FAIL;
FILE *config_file = NULL;
+
config_file = fopen(CMD_ARGV[0], "a");
if (config_file != NULL)
{
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)
{
}
}
if ((i == CMD_ARGC) && (fwrite("\n", 1, 1, config_file) == 1))
- {
retval = ERROR_OK;
- }
+
fclose(config_file);
}
{
if (CMD_ARGC != 2)
{
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
// NOTE!!! we only have line printing capability so we print the entire file as a single line.
FILE *f = fopen(CMD_ARGV[1], "wb");
if (f == NULL)
- retval = ERROR_INVALID_ARGUMENTS;
+ retval = ERROR_COMMAND_SYNTAX_ERROR;
size_t pos = 0;
for (;;)
}
if ((retval == ERROR_OK) && (fwrite(((char *)data) + pos, 1, chunk, f) != chunk))
- retval = ERROR_INVALID_ARGUMENTS;
+ retval = ERROR_COMMAND_SYNTAX_ERROR;
if (retval != ERROR_OK)
{
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, "copy failed");
}
if (data != NULL)
-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_COMMAND_SYNTAX_ERROR;
- 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;
}
static int
-zylinjtag_Jim_Command_ls(Jim_Interp *interp,
+ioutil_Jim_Command_ls(Jim_Interp *interp,
int argc,
Jim_Obj * const *argv)
{
}
static int
-zylinjtag_Jim_Command_peek(Jim_Interp *interp,
+ioutil_Jim_Command_peek(Jim_Interp *interp,
int argc,
Jim_Obj * const *argv)
{
}
static int
-zylinjtag_Jim_Command_poke(Jim_Interp *interp,
+ioutil_Jim_Command_poke(Jim_Interp *interp,
int argc,
Jim_Obj * const *argv)
{
/* not so pretty code to fish out ip number*/
-static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
+static int ioutil_Jim_Command_ip(Jim_Interp *interp, int argc,
Jim_Obj * const *argv)
{
#if !defined(__CYGWIN__)
}
/* not so pretty code to fish out eth0 mac address */
-static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc,
+static int ioutil_Jim_Command_mac(Jim_Interp *interp, int argc,
Jim_Obj * const *argv)
{
static const struct command_registration ioutil_command_handlers[] = {
{
.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 [<string1>, [<string2>, ...]]",
},
{
.name = "meminfo",
- .handler = &handle_meminfo_command,
+ .handler = handle_meminfo_command,
.mode = COMMAND_ANY,
- .help = "display available ram memory",
+ .help = "display free heap space",
},
- // jim handlers
{
.name = "rm",
.mode = COMMAND_ANY,
- .jim_handler = &zylinjtag_Jim_Command_rm,
- .help = "remove a file",
- .usage = "<file>",
+ .handler = handle_rm_command,
+ .help = "remove a directory or file",
+ .usage = "file_name",
},
+
+ /*
+ * Peek and poke are security holes -- they manipulate
+ * server-internal addresses.
+ */
+
+ // jim handlers
{
.name = "peek",
.mode = COMMAND_ANY,
- .jim_handler = &zylinjtag_Jim_Command_peek,
+ .jim_handler = ioutil_Jim_Command_peek,
.help = "peek at a memory address",
- .usage = "<addr>",
+ .usage = "address",
},
{
.name = "poke",
.mode = COMMAND_ANY,
- .jim_handler = &zylinjtag_Jim_Command_poke,
+ .jim_handler = ioutil_Jim_Command_poke,
.help = "poke at a memory address",
- .usage = "<addr> <value>",
+ .usage = "address value",
},
{
.name = "ls",
.mode = COMMAND_ANY,
- .jim_handler = &zylinjtag_Jim_Command_ls,
+ .jim_handler = ioutil_Jim_Command_ls,
.help = "show a listing of files",
- .usage = "<dir>",
+ .usage = "dirname",
},
{
.name = "mac",
.mode = COMMAND_ANY,
- .jim_handler = &zylinjtag_Jim_Command_mac,
+ .jim_handler = ioutil_Jim_Command_mac,
.help = "show MAC address",
},
{
.name = "ip",
- .jim_handler = &zylinjtag_Jim_Command_ip,
+ .jim_handler = ioutil_Jim_Command_ip,
.mode = COMMAND_ANY,
.help = "show IP address",
},
projects / fw / openocd / blobdiff