X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fhelper%2Fioutil.c;h=6e0fa4eb9e1a2c6f97e83807eefd4be340e5d4cc;hb=f876d5e9c769a288faa7fd14b7bf373363542aab;hp=ef9c0cebfb14af5201cee553082c4abccb4a4550;hpb=490e2712904a718efb320d0557f3bb8485676709;p=fw%2Fopenocd

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index ef9c0cebf..6e0fa4eb9 100644
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -24,48 +24,38 @@
 #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 <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/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
 
-#include <unistd.h>
-#include <stdio.h>
 
 int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd,
 		char **args, int argc)
@@ -162,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
@@ -225,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)
@@ -234,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;
 }
 
 
@@ -286,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;
 
@@ -327,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 );
 
@@ -493,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,