From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Wed, 17 Jun 2009 06:10:10 +0000 (+0000)
Subject: Fix compilation for Ubuntu 9.04 on x86-64 when using --enable-httpd.
X-Git-Tag: v0.2.0~253
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed5b5b834eb3d09ff1676ef60d25a629d9358a13;p=openocd

Fix compilation for Ubuntu 9.04 on x86-64 when using --enable-httpd.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2262 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 77e5e356..6e0fa4eb 100644
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -282,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;
 
@@ -323,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 );
 
diff --git a/src/server/httpd.c b/src/server/httpd.c
index 8ab5cb8f..2005a296 100644
--- a/src/server/httpd.c
+++ b/src/server/httpd.c
@@ -307,7 +307,7 @@ int handle_request(struct MHD_Connection * connection, const char * url)
 			return ret;
 		}
 
-		LOG_DEBUG("Serving %s length=%u", url, len);
+		LOG_DEBUG("Serving %s length=%zu", url, len);
 		/* serve file directly */
 		response = MHD_create_response_from_data(len, data, MHD_YES, MHD_NO);
 		MHD_add_response_header(response, "Content-Type", "image/png");