From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Mon, 1 Apr 2013 19:37:08 +0000 (+1100)
Subject: flac_mac patches from Janne Hyvärinen <cse@sci.fi>.
X-Git-Tag: 1.3.0pre4~37
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fflac.git;a=commitdiff_plain;h=ae5cc0c04669880af0b4f28b0945b9bc66274f4a

flac_mac patches from Janne Hyvärinen <cse@sci.fi>.
---

diff --git a/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj b/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj
index 6d80508..7b86e03 100644
--- a/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj
+++ b/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj
@@ -39,6 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,6 +117,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories="..\..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -195,6 +197,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories="..\..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
diff --git a/src/monkeys_audio_utilities/flac_mac/main.c b/src/monkeys_audio_utilities/flac_mac/main.c
index e8582a4..8c8fa3d 100644
--- a/src/monkeys_audio_utilities/flac_mac/main.c
+++ b/src/monkeys_audio_utilities/flac_mac/main.c
@@ -33,6 +33,7 @@
 #include<process.h>
 #include<winbase.h>
 
+#include "share/compat.h"
 #include "share/safe_str.h"
 
 static int execit(char *prog, char *args);
@@ -106,8 +107,8 @@ int main(int argc, char *argv[])
 	flac_snprintf(options, sizeof (options), "-%d", flac_level);
 	for(i = opt_arg; i < argc; i++)
 		if(argv[i][0] == '-') {
-			safe_strncat(options, " ");
-			safe_strncat(options, argv[i]);
+			safe_strncat(options, " ", sizeof(options));
+			safe_strncat(options, argv[i], sizeof(options));
 		}
 	flac_snprintf(cmdline, sizeof (cmdline), "\"%s\" %s -o \"%s\" \"%s\"", prog, options, argv[to_arg], argv[from_arg]);
 
@@ -131,8 +132,8 @@ int main(int argc, char *argv[])
 
 		/* for the full 'from' and 'to' paths for the renamer process */
 		p = strrchr(argv[from_arg],'\\');
-		safe_strncat(from, p? p+1 : argv[from_arg]);
-		safe_strncpy(to, from, sizeof(to));
+		safe_strncat(from, p? p+1 : argv[from_arg], sizeof(from));
+		safe_strncpy(to, from, sizeof(to), sizeof(to));
 
 		cptr = strrchr(from,'.');
 		if(cptr == NULL)