* 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-1307, USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
/* this file contains various functionality useful to standalone systems */
#include <ifaddrs.h>
#endif
#ifdef HAVE_MALLOC_H
-#if !BUILD_ECOSBOARD
#include <malloc.h>
#endif
-#endif
-
/* 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)
+static int load_file(const char *fileName, char **data, size_t *len)
{
- // ensure returned length is always sane
+ /* ensure returned length is always sane */
*len = 0;
- FILE * pFile;
- pFile = fopen(fileName,"rb");
- if (pFile == NULL)
- {
+ FILE *pFile;
+ pFile = fopen(fileName, "rb");
+ if (pFile == NULL) {
LOG_ERROR("Can't open %s", fileName);
return ERROR_FAIL;
}
- if (fseek(pFile, 0, SEEK_END) != 0)
- {
+ if (fseek(pFile, 0, SEEK_END) != 0) {
LOG_ERROR("Can't open %s", fileName);
fclose(pFile);
return ERROR_FAIL;
}
long fsize = ftell(pFile);
- if (fsize == -1)
- {
+ if (fsize == -1) {
LOG_ERROR("Can't open %s", fileName);
fclose(pFile);
return ERROR_FAIL;
}
*len = fsize;
- if (fseek(pFile, 0, SEEK_SET) != 0)
- {
+ if (fseek(pFile, 0, SEEK_SET) != 0) {
LOG_ERROR("Can't open %s", fileName);
fclose(pFile);
return ERROR_FAIL;
}
*data = malloc(*len + 1);
- if (*data == NULL)
- {
+ if (*data == NULL) {
LOG_ERROR("Can't open %s", fileName);
fclose(pFile);
return ERROR_FAIL;
}
- if (fread(*data, 1, *len, pFile)!=*len)
- {
+ if (fread(*data, 1, *len, pFile) != *len) {
fclose(pFile);
free(*data);
LOG_ERROR("Can't open %s", fileName);
}
fclose(pFile);
- // 0-byte after buffer (not included in *len) serves as a sentinel
- char *buf = (char *)*data;
- buf[*len] = 0;
+ /* 0-byte after buffer (not included in *len) serves as a sentinel */
+ (*data)[*len] = 0;
return ERROR_OK;
}
COMMAND_HANDLER(handle_cat_command)
{
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.
- void *data;
+ /* NOTE!!! we only have line printing capability so we print the entire file as a single
+ * line. */
+ char *data;
size_t len;
- int retval = loadFile(CMD_ARGV[0], &data, &len);
- if (retval == ERROR_OK)
- {
- command_print(CMD_CTX, "%s", (char *)data);
+ int retval = load_file(CMD_ARGV[0], &data, &len);
+ if (retval == ERROR_OK) {
+ command_print(CMD, "%s", data);
free(data);
- }
- else
- {
- command_print(CMD_CTX, "%s not found", CMD_ARGV[0]);
- }
+ } else
+ command_print(CMD, "%s not found", CMD_ARGV[0]);
return ERROR_OK;
}
COMMAND_HANDLER(handle_trunc_command)
{
if (CMD_ARGC != 1)
- {
- command_print(CMD_CTX, "trunc <filename>");
- return ERROR_INVALID_ARGUMENTS;
- }
+ return ERROR_COMMAND_SYNTAX_ERROR;
FILE *config_file = NULL;
config_file = fopen(CMD_ARGV[0], "w");
return ERROR_OK;
}
+#ifdef HAVE_MALLOC_H
COMMAND_HANDLER(handle_meminfo_command)
{
- static int prev = 0;
+ static int prev;
struct mallinfo info;
if (CMD_ARGC != 0)
- {
- command_print(CMD_CTX, "meminfo");
- return ERROR_INVALID_ARGUMENTS;
- }
+ return ERROR_COMMAND_SYNTAX_ERROR;
info = mallinfo();
if (prev > 0)
- {
- command_print(CMD_CTX, "Diff: %d", prev - info.fordblks);
- }
+ command_print(CMD, "Diff: %d", prev - info.fordblks);
prev = info.fordblks;
- command_print(CMD_CTX, "Available ram: %d", info.fordblks);
+ command_print(CMD, "Available ram: %d", info.fordblks);
return ERROR_OK;
}
-
+#endif
COMMAND_HANDLER(handle_append_command)
{
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)
- {
+ if (config_file != NULL) {
fseek(config_file, 0, SEEK_END);
unsigned i;
- for (i = 1; i < CMD_ARGC; i++)
- {
+ for (i = 1; i < CMD_ARGC; 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 - 1) {
if (fwrite(" ", 1, 1, config_file) != 1)
break;
}
return retval;
}
-
-
COMMAND_HANDLER(handle_cp_command)
{
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.
- void *data;
+ /* NOTE!!! we only have line printing capability so we print the entire file as a single
+ * line. */
+ char *data;
size_t len;
- int retval = loadFile(CMD_ARGV[0], &data, &len);
+ int retval = load_file(CMD_ARGV[0], &data, &len);
if (retval != ERROR_OK)
return retval;
FILE *f = fopen(CMD_ARGV[1], "wb");
if (f == NULL)
- retval = ERROR_INVALID_ARGUMENTS;
+ retval = ERROR_COMMAND_SYNTAX_ERROR;
size_t pos = 0;
- for (;;)
- {
+ for (;; ) {
size_t chunk = len - pos;
- static const size_t maxChunk = 512 * 1024; // ~1/sec
+ static const size_t maxChunk = 512 * 1024; /* ~1/sec */
if (chunk > maxChunk)
- {
chunk = maxChunk;
- }
- if ((retval == ERROR_OK) && (fwrite(((char *)data) + pos, 1, chunk, f) != chunk))
- retval = ERROR_INVALID_ARGUMENTS;
+ if ((retval == ERROR_OK) && (fwrite(data + pos, 1, chunk, f) != chunk))
+ retval = ERROR_COMMAND_SYNTAX_ERROR;
if (retval != ERROR_OK)
- {
break;
- }
- command_print(CMD_CTX, "%zu", len - pos);
+ command_print(CMD, "%zu", len - pos);
pos += chunk;
}
if (retval == ERROR_OK)
- {
- command_print(CMD_CTX, "Copied %s to %s", CMD_ARGV[0], CMD_ARGV[1]);
- } else
- {
- command_print(CMD_CTX, "copy failed");
- }
+ command_print(CMD, "Copied %s to %s", CMD_ARGV[0], CMD_ARGV[1]);
+ else
+ command_print(CMD, "copy failed");
if (data != NULL)
free(data);
return retval;
}
-
-
-
-#define SHOW_RESULT(a, b) LOG_ERROR(#a " failed %d\n", (int)b)
-
-#define IOSIZE 512
-void copyfile(char *name2, char *name1)
-{
-
- int err;
- char buf[IOSIZE];
- int fd1, fd2;
- ssize_t done, wrote;
-
- fd1 = open(name1, O_WRONLY | O_CREAT, 0664);
- if (fd1 < 0)
- SHOW_RESULT(open, fd1);
-
- fd2 = open(name2, O_RDONLY);
- if (fd2 < 0)
- SHOW_RESULT(open, fd2);
-
- for (;;)
- {
- done = read(fd2, buf, IOSIZE);
- if (done < 0)
- {
- SHOW_RESULT(read, done);
- break;
- }
-
- if (done == 0) break;
-
- wrote = write(fd1, buf, done);
- if (wrote != done) SHOW_RESULT(write, wrote);
-
- if (wrote != done) break;
- }
-
- err = close(fd1);
- if (err < 0) SHOW_RESULT(close, err);
-
- err = close(fd2);
- if (err < 0) SHOW_RESULT(close, err);
-
-}
-
-/* utility fn to copy a directory */
-void copydir(char *name, char *destdir)
-{
- int err;
- DIR *dirp;
-
- dirp = opendir(destdir);
- if (dirp == NULL)
- {
- mkdir(destdir, 0777);
- } else
- {
- err = closedir(dirp);
- }
-
- dirp = opendir(name);
- if (dirp == NULL) SHOW_RESULT(opendir, -1);
-
- for (;;)
- {
- struct dirent *entry = readdir(dirp);
-
- if (entry == NULL)
- break;
-
- if (strcmp(entry->d_name, ".") == 0)
- continue;
- if (strcmp(entry->d_name, "..") == 0)
- continue;
-
- int isDir = 0;
- struct stat buf;
- char fullPath[PATH_MAX];
- strncpy(fullPath, name, PATH_MAX);
- strcat(fullPath, "/");
- strncat(fullPath, entry->d_name, PATH_MAX - strlen(fullPath));
-
- if (stat(fullPath, &buf) == -1)
- {
- LOG_ERROR("unable to read status from %s", fullPath);
- break;
- }
- isDir = S_ISDIR(buf.st_mode) != 0;
-
- if (isDir)
- continue;
-
- // diag_printf("<INFO>: entry %14s",entry->d_name);
- char fullname[PATH_MAX];
- char fullname2[PATH_MAX];
-
- strcpy(fullname, name);
- strcat(fullname, "/");
- strcat(fullname, entry->d_name);
-
- strcpy(fullname2, destdir);
- strcat(fullname2, "/");
- strcat(fullname2, entry->d_name);
- // diag_printf("from %s to %s\n", fullname, fullname2);
- copyfile(fullname, fullname2);
-
- // diag_printf("\n");
- }
-
- err = closedir(dirp);
- if (err < 0) SHOW_RESULT(stat, err);
-}
-
-
-
-
COMMAND_HANDLER(handle_rm_command)
{
if (CMD_ARGC != 1)
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
bool del = false;
if (rmdir(CMD_ARGV[0]) == 0)
return del ? ERROR_OK : ERROR_FAIL;
}
-
-static int
-ioutil_Jim_Command_ls(Jim_Interp *interp,
- int argc,
- Jim_Obj * const *argv)
+static int ioutil_Jim_Command_ls(Jim_Interp *interp,
+ int argc,
+ Jim_Obj * const *argv)
{
- if (argc != 2)
- {
+ if (argc != 2) {
Jim_WrongNumArgs(interp, 1, argv, "ls ?dir?");
return JIM_ERR;
}
- char *name = (char*) Jim_GetString(argv[1], NULL);
+ const char *name = Jim_GetString(argv[1], NULL);
DIR *dirp = NULL;
dirp = opendir(name);
if (dirp == NULL)
- {
return JIM_ERR;
- }
Jim_Obj *objPtr = Jim_NewListObj(interp, NULL, 0);
- for (;;)
- {
+ for (;; ) {
struct dirent *entry = NULL;
entry = readdir(dirp);
if (entry == NULL)
break;
- if ((strcmp(".", entry->d_name) == 0)||(strcmp("..", entry->d_name) == 0))
+ if ((strcmp(".", entry->d_name) == 0) || (strcmp("..", entry->d_name) == 0))
continue;
- Jim_ListAppendElement(interp, objPtr, Jim_NewStringObj(interp, entry->d_name, strlen(entry->d_name)));
+ Jim_ListAppendElement(interp, objPtr,
+ Jim_NewStringObj(interp, entry->d_name, strlen(entry->d_name)));
}
closedir(dirp);
return JIM_OK;
}
-static int
-ioutil_Jim_Command_peek(Jim_Interp *interp,
- int argc,
- Jim_Obj * const *argv)
+static int ioutil_Jim_Command_peek(Jim_Interp *interp,
+ int argc,
+ Jim_Obj *const *argv)
{
- if (argc != 2)
- {
+ if (argc != 2) {
Jim_WrongNumArgs(interp, 1, argv, "peek ?address?");
return JIM_ERR;
}
return JIM_OK;
}
-static int
-ioutil_Jim_Command_poke(Jim_Interp *interp,
- int argc,
- Jim_Obj * const *argv)
+static int ioutil_Jim_Command_poke(Jim_Interp *interp,
+ int argc,
+ Jim_Obj *const *argv)
{
- if (argc != 3)
- {
+ if (argc != 3) {
Jim_WrongNumArgs(interp, 1, argv, "poke ?address? ?value?");
return JIM_ERR;
}
return JIM_OK;
}
-
/* not so pretty code to fish out ip number*/
static int ioutil_Jim_Command_ip(Jim_Interp *interp, int argc,
- Jim_Obj * const *argv)
+ Jim_Obj *const *argv)
{
#if !defined(__CYGWIN__)
Jim_Obj *tclOutput = Jim_NewStringObj(interp, "", 0);
struct ifaddrs *ifa = NULL, *ifp = NULL;
if (getifaddrs(&ifp) < 0)
- {
return JIM_ERR;
- }
- for (ifa = ifp; ifa; ifa = ifa->ifa_next)
- {
+ for (ifa = ifp; ifa; ifa = ifa->ifa_next) {
char ip[200];
socklen_t salen;
if (getnameinfo(ifa->ifa_addr, salen, ip, sizeof(ip), NULL, 0,
NI_NUMERICHOST) < 0)
- {
continue;
- }
Jim_AppendString(interp, tclOutput, ip, strlen(ip));
break;
return JIM_OK;
}
+#ifdef HAVE_SYS_IOCTL_H
+#ifdef SIOCGIFHWADDR
/* not so pretty code to fish out eth0 mac address */
static int ioutil_Jim_Command_mac(Jim_Interp *interp, int argc,
- Jim_Obj * const *argv)
+ Jim_Obj *const *argv)
{
-
-
struct ifreq *ifr, *ifend;
struct ifreq ifreq;
struct ifconf ifc;
SockFD = socket(AF_INET, SOCK_DGRAM, 0);
if (SockFD < 0)
- {
return JIM_ERR;
- }
ifc.ifc_len = sizeof(ifs);
ifc.ifc_req = ifs;
- if (ioctl(SockFD, SIOCGIFCONF, &ifc) < 0)
- {
+ if (ioctl(SockFD, SIOCGIFCONF, &ifc) < 0) {
close(SockFD);
return JIM_ERR;
}
ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq));
- for (ifr = ifc.ifc_req; ifr < ifend; ifr++)
- {
- //if (ifr->ifr_addr.sa_family == AF_INET)
+ for (ifr = ifc.ifc_req; ifr < ifend; ifr++) {
+ /* if (ifr->ifr_addr.sa_family == AF_INET) */
{
if (strcmp("eth0", ifr->ifr_name) != 0)
continue;
- strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name));
- if (ioctl(SockFD, SIOCGIFHWADDR, &ifreq) < 0)
- {
+ strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name) - 1);
+ if (ioctl(SockFD, SIOCGIFHWADDR, &ifreq) < 0) {
close(SockFD);
return JIM_ERR;
}
close(SockFD);
-
Jim_Obj *tclOutput = Jim_NewStringObj(interp, "", 0);
char buffer[256];
sprintf(buffer, "%02x-%02x-%02x-%02x-%02x-%02x",
- ifreq.ifr_hwaddr.sa_data[0]&0xff,
- ifreq.ifr_hwaddr.sa_data[1]&0xff,
- ifreq.ifr_hwaddr.sa_data[2]&0xff,
- ifreq.ifr_hwaddr.sa_data[3]&0xff,
- ifreq.ifr_hwaddr.sa_data[4]&0xff,
- ifreq.ifr_hwaddr.sa_data[5]&0xff);
+ ifreq.ifr_hwaddr.sa_data[0]&0xff,
+ ifreq.ifr_hwaddr.sa_data[1]&0xff,
+ ifreq.ifr_hwaddr.sa_data[2]&0xff,
+ ifreq.ifr_hwaddr.sa_data[3]&0xff,
+ ifreq.ifr_hwaddr.sa_data[4]&0xff,
+ ifreq.ifr_hwaddr.sa_data[5]&0xff);
Jim_AppendString(interp, tclOutput, buffer, strlen(buffer));
return JIM_ERR;
}
+#endif
+#endif
static const struct command_registration ioutil_command_handlers[] = {
{
.handler = handle_cat_command,
.mode = COMMAND_ANY,
.help = "display text file content",
- .usage= "file_name",
+ .usage = "file_name",
},
{
.name = "trunc",
.handler = handle_trunc_command,
.mode = COMMAND_ANY,
.help = "truncate a file to zero length",
- .usage= "file_name",
+ .usage = "file_name",
},
{
.name = "cp",
.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>, ...]]",
},
+#ifdef HAVE_MALLOC_H
{
.name = "meminfo",
.handler = handle_meminfo_command,
.mode = COMMAND_ANY,
.help = "display free heap space",
+ .usage = "",
},
+#endif
{
.name = "rm",
.mode = COMMAND_ANY,
* server-internal addresses.
*/
- // jim handlers
+ /* jim handlers */
{
.name = "peek",
.mode = COMMAND_ANY,
.help = "show a listing of files",
.usage = "dirname",
},
+#ifdef HAVE_SYS_IOCTL_H
+#ifdef SIOCGIFHWADDR
{
.name = "mac",
.mode = COMMAND_ANY,
.jim_handler = ioutil_Jim_Command_mac,
.help = "show MAC address",
},
+#endif
+#endif
{
.name = "ip",
.jim_handler = ioutil_Jim_Command_ip,
Code Review / openocd.git / blobdiff