X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fioutil.c;h=1423462c1088b45458fcc08070cff297caeb2da7;hp=66908aff5becb59e7b7cbbcc4d6020d7bbb83448;hb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e;hpb=1000674d1c8d504052c12ab853fcb8532abcee1a diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c index 66908aff5b..1423462c10 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,53 +24,40 @@ #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) +COMMAND_HANDLER(handle_rm_command) { if (argc != 1) { @@ -91,14 +78,17 @@ 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) + 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); @@ -111,15 +101,16 @@ int loadFile(const char *fileName, void **data, size_t *len) 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(fsize + 1); - if (*data==NULL) + *data = malloc(*len + 1); + if (*data == NULL) { LOG_ERROR("Can't open %s\n", fileName); fclose(pFile); @@ -134,18 +125,15 @@ 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; } - - -int handle_cat_command(struct command_context_s *cmd_ctx, char *cmd, - char **args, int argc) +COMMAND_HANDLER(handle_cat_command) { if (argc != 1) { @@ -160,7 +148,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 @@ -170,8 +158,8 @@ int handle_cat_command(struct command_context_s *cmd_ctx, char *cmd, 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) { @@ -187,8 +175,7 @@ int handle_trunc_command(struct command_context_s *cmd_ctx, char *cmd, 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; @@ -207,14 +194,13 @@ int handle_meminfo_command(struct command_context_s *cmd_ctx, char *cmd, char ** } 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) { @@ -223,6 +209,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,22 +219,27 @@ 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; } -int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_cp_command) { if (argc != 2) { @@ -276,7 +268,7 @@ int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, 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) @@ -284,7 +276,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,36 +317,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); } @@ -365,7 +357,7 @@ void copydir(char *name, char *destdir) DIR *dirp; dirp = opendir(destdir); - if (dirp==NULL) + if (dirp == NULL) { mkdir(destdir, 0777); } else @@ -374,7 +366,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 +415,7 @@ void copydir(char *name, char *destdir) } err = closedir(dirp); - if( err < 0 ) SHOW_RESULT( stat, err ); + if (err < 0) SHOW_RESULT(stat, err); } @@ -479,7 +471,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))); @@ -491,32 +483,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, @@ -641,7 +607,7 @@ static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc, { //if (ifr->ifr_addr.sa_family == AF_INET) { - if (strcmp("eth0", ifr->ifr_name)!=0) + 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)