X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Fioutil.c;h=ed82ba1cd78fa823476b2ab8cea0dd7d530fad21;hb=c538a830cdaafa92c9e9a624d84915cc39cce05b;hp=101df2d94649f053c4fac7f27a62b96dfa549a88;hpb=0748b5ad4c6c99bd646f96398a90ff6e37d92dac;p=openocd.git diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c index 101df2d946..ed82ba1cd7 100644 --- a/src/helper/ioutil.c +++ b/src/helper/ioutil.c @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Øyvind Harboe * + * Copyright (C) 2007-2008 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 * @@ -24,99 +24,73 @@ #endif #include "log.h" -#include "types.h" -#include "configuration.h" -#include "target.h" - -#include "command.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#if !BUILD_ECOSBOARD -#include -#endif -#include - +#include "time_support.h" -#include -#include -#include -#include -#include -#include -#include -#include +#ifdef HAVE_ARPA_INET_H #include -#include -#include +#endif +#ifdef HAVE_DIRENT_H +#include +#endif +#ifdef HAVE_NETDB_H #include -#include -#include -#include -#include -#include - - -#include -#include - -int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd, - char **args, int argc) -{ - 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; -} +#endif +#ifdef HAVE_NET_IF_H +#include +#endif +#ifdef HAVE_SYS_IOCTL_H +#include +#endif +#ifdef HAVE_SYS_STAT_H +#include +#endif +#ifdef HAVE_IFADDRS_H +#include +#endif +#ifdef HAVE_MALLOC_H +#if !BUILD_ECOSBOARD +#include +#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, int *len) +int loadFile(const char *fileName, void **data, size_t *len) { + // ensure returned length is always sane + *len = 0; + FILE * pFile; pFile = fopen(fileName,"rb"); - if (pFile==NULL) + if (pFile == NULL) { LOG_ERROR("Can't open %s\n", fileName); return ERROR_FAIL; } - if (fseek(pFile, 0, SEEK_END)!=0) + if (fseek(pFile, 0, SEEK_END) != 0) { LOG_ERROR("Can't open %s\n", fileName); fclose(pFile); return ERROR_FAIL; } - *len=ftell(pFile); - if (*len==-1) + long fsize = ftell(pFile); + if (fsize == -1) { LOG_ERROR("Can't open %s\n", 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\n", fileName); fclose(pFile); return ERROR_FAIL; } - *data=malloc(*len+1); - if (*data==NULL) + *data = malloc(*len + 1); + if (*data == NULL) { LOG_ERROR("Can't open %s\n", fileName); fclose(pFile); @@ -131,68 +105,64 @@ int loadFile(const char *fileName, void **data, int *len) return ERROR_FAIL; } fclose(pFile); - *(((char *)(*data))+*len)=0; /* sentinel */ - - return ERROR_OK; - + // 0-byte after buffer (not included in *len) serves as a sentinel + char *buf = (char *)*data; + buf[*len] = 0; + return ERROR_OK; } - - -int handle_cat_command(struct command_context_s *cmd_ctx, char *cmd, - char **args, int argc) +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; } // NOTE!!! we only have line printing capability so we print the entire file as a single line. void *data; - int len; + 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", 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; } -int handle_trunc_command(struct command_context_s *cmd_ctx, char *cmd, - char **args, int argc) + +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); return ERROR_OK; } - -int handle_meminfo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +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; } @@ -200,80 +170,85 @@ int handle_meminfo_command(struct command_context_s *cmd_ctx, char *cmd, char ** 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; } -int handle_append_command(struct command_context_s *cmd_ctx, char *cmd, - char **args, int argc) +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) { - int i; fseek(config_file, 0, SEEK_END); - for (i = 1; i < argc; i++) + unsigned i; + for (i = 1; i < CMD_ARGC; i++) { - fwrite(args[i], strlen(args[i]), 1, config_file); - if (i != argc - 1) + if (fwrite(CMD_ARGV[i], 1, strlen(CMD_ARGV[i]), config_file) != strlen(CMD_ARGV[i])) + break; + if (i != CMD_ARGC - 1) { - fwrite(" ", 1, 1, config_file); + if (fwrite(" ", 1, 1, config_file) != 1) + break; } } - fwrite("\n", 1, 1, config_file); + if ((i == CMD_ARGC) && (fwrite("\n", 1, 1, config_file) == 1)) + { + retval = ERROR_OK; + } fclose(config_file); } - return ERROR_OK; + return retval; } -int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_cp_command) { - if (argc != 2) + if (CMD_ARGC != 2) { return ERROR_INVALID_ARGUMENTS; } // NOTE!!! we only have line printing capability so we print the entire file as a single line. void *data; - int len; + 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; - int pos = 0; + size_t pos = 0; for (;;) { - int chunk = len - pos; - static const int maxChunk = 512 * 1024; // ~1/sec + size_t chunk = len - pos; + 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)) + if ((retval == ERROR_OK) && (fwrite(((char *)data) + pos, 1, chunk, f) != chunk)) retval = ERROR_INVALID_ARGUMENTS; if (retval != ERROR_OK) @@ -281,7 +256,7 @@ int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, break; } - command_print(cmd_ctx, "%d", len - pos); + command_print(CMD_CTX, "%zu", len - pos); pos += chunk; @@ -291,10 +266,10 @@ int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, 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) @@ -303,7 +278,7 @@ int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, fclose(f); if (retval != ERROR_OK) - unlink(args[1]); + unlink(CMD_ARGV[1]); return retval; } @@ -322,36 +297,36 @@ void copyfile(char *name2, char *name1) int fd1, fd2; ssize_t done, wrote; - fd1 = open(name1, O_WRONLY | O_CREAT); + fd1 = open(name1, O_WRONLY | O_CREAT, 0664); if (fd1 < 0) - SHOW_RESULT( open, fd1 ); + SHOW_RESULT(open, fd1); fd2 = open(name2, O_RDONLY); if (fd2 < 0) - SHOW_RESULT( open, fd2 ); + SHOW_RESULT(open, fd2); for (;;) { - done = read(fd2, buf, IOSIZE ); + done = read(fd2, buf, IOSIZE); if (done < 0) { - SHOW_RESULT( read, done ); + SHOW_RESULT(read, done); break; } - if( done == 0 ) break; + if (done == 0) break; wrote = write(fd1, buf, done); - if( wrote != done ) SHOW_RESULT( write, wrote ); + if (wrote != done) SHOW_RESULT(write, wrote); - if( wrote != done ) break; + if (wrote != done) break; } err = close(fd1); - if( err < 0 ) SHOW_RESULT( close, err ); + if (err < 0) SHOW_RESULT(close, err); err = close(fd2); - if( err < 0 ) SHOW_RESULT( close, err ); + if (err < 0) SHOW_RESULT(close, err); } @@ -362,7 +337,7 @@ void copydir(char *name, char *destdir) DIR *dirp; dirp = opendir(destdir); - if (dirp==NULL) + if (dirp == NULL) { mkdir(destdir, 0777); } else @@ -371,7 +346,7 @@ void copydir(char *name, char *destdir) } dirp = opendir(name); - if( dirp == NULL ) SHOW_RESULT( opendir, -1 ); + if (dirp == NULL) SHOW_RESULT(opendir, -1); for (;;) { @@ -420,7 +395,7 @@ void copydir(char *name, char *destdir) } err = closedir(dirp); - if( err < 0 ) SHOW_RESULT( stat, err ); + if (err < 0) SHOW_RESULT(stat, err); } @@ -476,7 +451,7 @@ zylinjtag_Jim_Command_ls(Jim_Interp *interp, 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))); @@ -488,30 +463,6 @@ zylinjtag_Jim_Command_ls(Jim_Interp *interp, return JIM_OK; } -int handle_peek_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - if (argc != 1) - { - return ERROR_COMMAND_SYNTAX_ERROR; - } - volatile int *address=(volatile int *)strtoul(args[0], NULL, 0); - int value=*address; - command_print(cmd_ctx, "0x%x : 0x%x", address, value); - return ERROR_OK; -} - -int handle_poke_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - if (argc != 2) - { - return ERROR_INVALID_ARGUMENTS; - } - volatile int *address=(volatile int *)strtoul(args[0], NULL, 0); - int value=strtoul(args[1], NULL, 0); - *address=value; - return ERROR_OK; -} - static int zylinjtag_Jim_Command_peek(Jim_Interp *interp, int argc, @@ -557,34 +508,201 @@ zylinjtag_Jim_Command_poke(Jim_Interp *interp, return JIM_OK; } -int ioutil_init(struct command_context_s *cmd_ctx) + +/* not so pretty code to fish out ip number*/ +static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc, + Jim_Obj * const *argv) { - register_command(cmd_ctx, NULL, "rm", handle_rm_command, COMMAND_ANY, - "remove file"); +#if !defined(__CYGWIN__) + Jim_Obj *tclOutput = Jim_NewStringObj(interp, "", 0); - register_command(cmd_ctx, NULL, "cat", handle_cat_command, COMMAND_ANY, - "display file content"); + struct ifaddrs *ifa = NULL, *ifp = NULL; - register_command(cmd_ctx, NULL, "trunc", handle_trunc_command, COMMAND_ANY, - "truncate a file to 0 size"); + if (getifaddrs(&ifp) < 0) + { + return JIM_ERR; + } - register_command(cmd_ctx, NULL, "cp", handle_cp_command, - COMMAND_ANY, "copy a file "); + for (ifa = ifp; ifa; ifa = ifa->ifa_next) + { + char ip[200]; + socklen_t salen; - register_command(cmd_ctx, NULL, "append_file", handle_append_command, - COMMAND_ANY, "append a variable number of strings to a file"); + if (ifa->ifa_addr->sa_family == AF_INET) + salen = sizeof(struct sockaddr_in); + else if (ifa->ifa_addr->sa_family == AF_INET6) + salen = sizeof(struct sockaddr_in6); + else + continue; - register_command(cmd_ctx, NULL, "meminfo", handle_meminfo_command, - COMMAND_ANY, "display available ram memory"); + if (getnameinfo(ifa->ifa_addr, salen, ip, sizeof(ip), NULL, 0, + NI_NUMERICHOST) < 0) + { + continue; + } - Jim_CreateCommand(interp, "rm", zylinjtag_Jim_Command_rm, NULL, NULL); + Jim_AppendString(interp, tclOutput, ip, strlen(ip)); + break; - 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); + } + freeifaddrs(ifp); +#else + Jim_Obj *tclOutput = Jim_NewStringObj(interp, "fixme!!!", 0); + LOG_ERROR("NOT IMPLEMENTED!!!"); +#endif + Jim_SetResult(interp, tclOutput); - return ERROR_OK; + return JIM_OK; } +/* not so pretty code to fish out eth0 mac address */ +static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc, + Jim_Obj * const *argv) +{ + + + struct ifreq *ifr, *ifend; + struct ifreq ifreq; + struct ifconf ifc; + struct ifreq ifs[5]; + int SockFD; + 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) + { + 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) + { + 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) + { + 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); + + Jim_AppendString(interp, tclOutput, buffer, strlen(buffer)); + + Jim_SetResult(interp, tclOutput); + + return JIM_OK; + } + } + close(SockFD); + + return JIM_ERR; + +} + +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) +{ + return register_commands(cmd_ctx, NULL, ioutil_command_handlers); +}