diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-04-02 06:37:08 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-04-02 06:37:13 +1100 |
| commit | ae5cc0c04669880af0b4f28b0945b9bc66274f4a (patch) | |
| tree | f4ae109db3c24e44a7b78bc5bd456b0042c64a71 | |
| parent | 1e89230c3ea21568529bc006084ce25f3b82c516 (diff) | |
| download | flac-ae5cc0c04669880af0b4f28b0945b9bc66274f4a.tar.gz | |
flac_mac patches from Janne Hyvärinen <cse@sci.fi>.
| -rw-r--r-- | src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj | 3 | ||||
| -rw-r--r-- | src/monkeys_audio_utilities/flac_mac/main.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj b/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj index 6d80508e..7b86e035 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 e8582a4b..8c8fa3da 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) |