#include <time_support.h>
#include <sys/time.h>
-#include <sys/types.h>
#include <strings.h>
#include <stdio.h>
#include <stdlib.h>
#include <netinet/in.h>
#include <net/if.h>
#include <arpa/inet.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.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;