Remove unecessary(and poptentially harmful?) "" around arguments

[fw/openocd] / src / helper / ioutil.c

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 66908aff5becb59e7b7cbbcc4d6020d7bbb83448..e595b144599147dd7becd7bede30045c6d309154 100644 (file)
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -24,50 +24,41 @@
 #endif
 
 #include "log.h"
-#include "types.h"
-#include "configuration.h"
-#include "target.h"
-
-#include "command.h"
-
-#include <time_support.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#if !BUILD_ECOSBOARD
-#include <malloc.h>
-#endif
-#include <errno.h>
-
+#include "time_support.h"
 
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <netinet/tcp.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <net/if.h>
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#endif
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <string.h>
-
-#if !defined(__CYGWIN__)
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+//#ifdef HAVE_NETINET_TCP_H
+//#include <netinet/tcp.h>
+//#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_IFADDRS_H
 #include <ifaddrs.h>
 #endif
+#ifdef HAVE_MALLOC_H
+#if !BUILD_ECOSBOARD
+#include <malloc.h>
+#endif
+#endif
+//#ifdef HAVE_STRINGS_H
+//#include <strings.h>
+//#endif
 
-#include <unistd.h>
-#include <stdio.h>
 
 int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd,
                char **args, int argc)
@@ -91,6 +82,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 +105,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 +113,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 +129,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;
 }