msvc: make MSVC shutup on strncpy()

hsebs · May 27, 2014 · 2a33afe · 2a33afe
1 parent dc1af54
commit 2a33afe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/arch/XCore/XCoreInstPrinter.c b/arch/XCore/XCoreInstPrinter.c
@@ -46,8 +46,17 @@ void XCore_insn_extract(MCInst *MI, char *code)
 	char *p, *p2;
 	char tmp[128];
 
+// make MSVC shutup on strncpy()
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+	strncpy(tmp, code, strlen(code)); // safe because code is way shorter than 128 bytes
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 	// find the first space
-	strcpy(tmp, code);
 	p = strchr(tmp, ' ');
 	if (p) {
 		p++;

diff --git a/utils.h b/utils.h
@@ -7,13 +7,12 @@
 #include "include/capstone.h"
 #include "cs_priv.h"
 
-// strcasecmp() & strcpy() for MSVC
+// strcasecmp() for MSVC
 #if !defined(__MINGW32__) && !defined(__MINGW64__)  // this is not MingW
 #if defined (WIN32) || defined (WIN64) || defined (_WIN32) || defined (_WIN64)
 
 // string.h
 #define strcasecmp _stricmp
-#define strcpy strcpy_s
 
 #endif	// MSVC
 #endif	// not MingW