#include <stdio.h>
#include <string.h>
+#if !defined(__CYGWIN__)
+#include <ifaddrs.h>
+#endif
#include <unistd.h>
#include <stdio.h>
/* 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)
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)
{
fclose(pFile);
return ERROR_FAIL;
}
- *data=malloc(*len+1);
+ *data = malloc(*len + 1);
if (*data==NULL)
{
LOG_ERROR("Can't open %s\n", fileName);
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;
}
// 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);
if (retval == ERROR_OK)
// 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);
if (retval != ERROR_OK)
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;
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
- volatile int *address=(volatile int *)strtoul(args[0], NULL, 0);
- int value=*address;
+ unsigned long addr = strtoul(args[0], NULL, 0);
+ volatile unsigned *address = (volatile unsigned *)addr;
+ unsigned value = *address;
command_print(cmd_ctx, "0x%x : 0x%x", address, value);
return ERROR_OK;
}
{
return ERROR_INVALID_ARGUMENTS;
}
- volatile int *address=(volatile int *)strtoul(args[0], NULL, 0);
+ unsigned long addr = strtoul(args[0], NULL, 0);
+ volatile int *address = (volatile int *)addr;
int value=strtoul(args[1], NULL, 0);
*address=value;
return ERROR_OK;
return JIM_OK;
}
+
+/* not so pretty code to fish out ip number*/
+static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
+ 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)
+ {
+ char ip[200];
+ socklen_t salen;
+
+ 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;
+
+ if (getnameinfo(ifa->ifa_addr, salen, ip, sizeof(ip), NULL, 0,
+ NI_NUMERICHOST) < 0)
+ {
+ continue;
+ }
+
+ Jim_AppendString(interp, tclOutput, ip, strlen(ip));
+ break;
+
+ }
+
+ freeifaddrs(ifp);
+#else
+ Jim_Obj *tclOutput = Jim_NewStringObj(interp, "fixme!!!", 0);
+ LOG_ERROR("NOT IMPLEMENTED!!!");
+#endif
+ Jim_SetResult(interp, tclOutput);
+
+ 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;
+
+}
+
+
+
int ioutil_init(struct command_context_s *cmd_ctx)
{
register_command(cmd_ctx, NULL, "rm", handle_rm_command, COMMAND_ANY,
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;
}
Code Review / openocd.git / blobdiff