X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fioutil.c;h=901cf2b49e26a72bdd88383ca26554724dec52ec;hp=66908aff5becb59e7b7cbbcc4d6020d7bbb83448;hb=e43979e7020ea9d05a3c0a2af444f292eacb6c53;hpb=1000674d1c8d504052c12ab853fcb8532abcee1a diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c index 66908aff5b..901cf2b49e 100644 --- a/src/helper/ioutil.c +++ b/src/helper/ioutil.c @@ -24,50 +24,38 @@ #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 - -#if !defined(__CYGWIN__) +#endif +#ifdef HAVE_NET_IF_H +#include +#endif +//#ifdef HAVE_NETINET_TCP_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 -#include -#include int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) @@ -91,6 +79,9 @@ int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd, * a 0 byte(sentinel) after len bytes - the length of the file. */ 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) @@ -111,6 +102,7 @@ int loadFile(const char *fileName, void **data, size_t *len) fclose(pFile); return ERROR_FAIL; } + *len = fsize; if (fseek(pFile, 0, SEEK_SET)!=0) { @@ -118,7 +110,7 @@ int loadFile(const char *fileName, void **data, size_t *len) fclose(pFile); return ERROR_FAIL; } - *data = malloc(fsize + 1); + *data = malloc(*len + 1); if (*data==NULL) { LOG_ERROR("Can't open %s\n", fileName); @@ -134,12 +126,12 @@ int loadFile(const char *fileName, void **data, size_t *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; } @@ -160,7 +152,7 @@ int handle_cat_command(struct command_context_s *cmd_ctx, char *cmd, int retval = loadFile(args[0], &data, &len); if (retval == ERROR_OK) { - command_print(cmd_ctx, "%s", data); + command_print(cmd_ctx, "%s", (char *)data); free(data); } else @@ -223,6 +215,7 @@ int handle_append_command(struct command_context_s *cmd_ctx, char *cmd, return ERROR_INVALID_ARGUMENTS; } + int retval=ERROR_FAIL; FILE *config_file = NULL; config_file = fopen(args[0], "a"); if (config_file != NULL) @@ -232,17 +225,22 @@ int handle_append_command(struct command_context_s *cmd_ctx, char *cmd, for (i = 1; i < argc; i++) { - fwrite(args[i], strlen(args[i]), 1, config_file); + if (fwrite(args[i], 1, strlen(args[i]), config_file)!=strlen(args[i])) + break; if (i != argc - 1) { - fwrite(" ", 1, 1, config_file); + if (fwrite(" ", 1, 1, config_file)!=1) + break; } } - fwrite("\n", 1, 1, config_file); + if ((i==argc)&&(fwrite("\n", 1, 1, config_file)==1)) + { + retval=ERROR_OK; + } fclose(config_file); } - return ERROR_OK; + return retval; } @@ -284,7 +282,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; @@ -325,7 +323,7 @@ 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 ); @@ -342,19 +340,19 @@ void copyfile(char *name2, char *name1) 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 ); } @@ -374,7 +372,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 (;;) { @@ -423,7 +421,7 @@ void copydir(char *name, char *destdir) } err = closedir(dirp); - if( err < 0 ) SHOW_RESULT( stat, err ); + if ( err < 0 ) SHOW_RESULT( stat, err ); } @@ -491,32 +489,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; - } - 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; -} - -int handle_poke_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - if (argc != 2) - { - return ERROR_INVALID_ARGUMENTS; - } - 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; -} - static int zylinjtag_Jim_Command_peek(Jim_Interp *interp, int argc,