From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Sun, 17 Mar 2013 11:05:58 +0000 (+1100)
Subject: Windows flac_snprintf tweaks.
X-Git-Tag: 1.3.0pre4~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=74aac94cda9b00dc87e5a90b8790a5a08daff114;p=platform%2Fupstream%2Fflac.git

Windows flac_snprintf tweaks.

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

diff --git a/FLAC.sln b/FLAC.sln
index 374b7e1..84bcf7b 100644
--- a/FLAC.sln
+++ b/FLAC.sln
@@ -39,6 +39,9 @@ Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "iffscan", "src\flac\iffscan
 	EndProjectSection
 EndProject
 Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "flac_mac", "src\monkeys_audio_utilities\flac_mac\flac_mac.vcproj", "{4cefbc7e-c215-11db-8314-0800200c9a66}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66}
+	EndProjectSection
 EndProject
 Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "flac_ren", "src\monkeys_audio_utilities\flac_ren\flac_ren.vcproj", "{4cefbc7f-c215-11db-8314-0800200c9a66}"
 EndProject
@@ -125,6 +128,9 @@ Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "test_seeking", "src\test_se
 	EndProjectSection
 EndProject
 Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "test_streams", "src\test_streams\test_streams.vcproj", "{4cefbc91-c215-11db-8314-0800200c9a66}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66}
+	EndProjectSection
 EndProject
 Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "utf8_static", "src\share\utf8\utf8_static.vcproj", "{4cefbc92-c215-11db-8314-0800200c9a66}"
 EndProject
diff --git a/src/monkeys_audio_utilities/flac_mac/main.c b/src/monkeys_audio_utilities/flac_mac/main.c
index 21d4f71..c93a9c9 100644
--- a/src/monkeys_audio_utilities/flac_mac/main.c
+++ b/src/monkeys_audio_utilities/flac_mac/main.c
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 		strcpy(strrchr(to,'.'), ".flac");
 
 		flac_snprintf(prog, sizeof (prog), "%sflac_ren.exe", macdir);
-		flac_snprintf(cmdline, sizeof (smdline), "\"%s\" \"%s\" \"%s\"", prog, from, to);
+		flac_snprintf(cmdline, sizeof (cmdline), "\"%s\" \"%s\" \"%s\"", prog, from, to);
 
 		flac_return_val = forkit(prog, cmdline);
 	}
diff --git a/src/share/grabbag/snprintf.c b/src/share/grabbag/snprintf.c
index f57a6a9..a7d59d7 100644
--- a/src/share/grabbag/snprintf.c
+++ b/src/share/grabbag/snprintf.c
@@ -62,7 +62,7 @@ flac_snprintf(char *str, size_t size, const char *fmt, ...)
 	va_start (va, fmt);
 
 #ifdef _MSC_VER
-	rc = vsnprintf_s (str, size, fmt, va);
+	rc = vsnprintf_s (str, size, _TRUNCATE, fmt, va);
 	rc = (rc > 0) ? rc : (size == 0 ? 1024 : size * 2);
 #else
 	rc = vsnprintf (str, size, fmt, va);