From cee72905099ee7be2bc7327907e09a28f2220d15 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 16 Sep 2018 18:35:44 +0300
Subject: libmdbx: fix for GC

---
 libs/libmdbx/src/test/log.cc          | 6 +++---
 libs/libmdbx/src/test/log.h           | 2 +-
 libs/libmdbx/src/test/osal-windows.cc | 5 ++++-
 libs/libmdbx/src/test/test.vcxproj    | 4 ++++
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'libs/libmdbx/src/test')

diff --git a/libs/libmdbx/src/test/log.cc b/libs/libmdbx/src/test/log.cc
index 7bc3ecf613..0e325e3add 100644
--- a/libs/libmdbx/src/test/log.cc
+++ b/libs/libmdbx/src/test/log.cc
@@ -57,7 +57,7 @@ static void mdbx_logger(int type, const char *function, int line,
   if (logging::output(
           level,
           strncmp(function, "mdbx_", 5) == 0 ? "%s: " : "mdbx: %s: ", function))
-    logging::feed(msg, args);
+    logging::feed_ap(msg, args);
   if (type & MDBX_DBG_ASSERT)
     abort();
 }
@@ -193,7 +193,7 @@ bool output(const logging::loglevel priority, const char *format, va_list ap) {
   return true;
 }
 
-bool feed(const char *format, va_list ap) {
+bool feed_ap(const char *format, va_list ap) {
   if (!last)
     return false;
 
@@ -212,7 +212,7 @@ bool feed(const char *format, ...) {
 
   va_list ap;
   va_start(ap, format);
-  feed(format, ap);
+  feed_ap(format, ap);
   va_end(ap);
   return true;
 }
diff --git a/libs/libmdbx/src/test/log.h b/libs/libmdbx/src/test/log.h
index 7350f1b9b1..ecdd91bf88 100644
--- a/libs/libmdbx/src/test/log.h
+++ b/libs/libmdbx/src/test/log.h
@@ -42,7 +42,7 @@ void setlevel(loglevel level);
 bool output(const loglevel priority, const char *format, va_list ap);
 bool __printf_args(2, 3)
     output(const loglevel priority, const char *format, ...);
-bool feed(const char *format, va_list ap);
+bool feed_ap(const char *format, va_list ap);
 bool __printf_args(1, 2) feed(const char *format, ...);
 
 class local_suffix {
diff --git a/libs/libmdbx/src/test/osal-windows.cc b/libs/libmdbx/src/test/osal-windows.cc
index b8cdb53513..81f1da7f86 100644
--- a/libs/libmdbx/src/test/osal-windows.cc
+++ b/libs/libmdbx/src/test/osal-windows.cc
@@ -268,9 +268,12 @@ int osal_actor_start(const actor_config &config, mdbx_pid_t &pid) {
                                   &exename_size))
     failure_perror("QueryFullProcessImageName()", GetLastError());
 
-  std::string cmdline = "test_mdbx.child ";
+  std::string cmdline = "$ ";
   ArgvQuote(cmdline, thunk_param(config));
 
+  if (cmdline.size() >= 32767)
+    return ERROR_BAD_LENGTH;
+
   PROCESS_INFORMATION ProcessInformation;
   if (!CreateProcessA(exename, const_cast<char *>(cmdline.c_str()),
                       NULL, // Retuned process handle is not inheritable.
diff --git a/libs/libmdbx/src/test/test.vcxproj b/libs/libmdbx/src/test/test.vcxproj
index 3ee13cf8cf..a8c21d38c5 100644
--- a/libs/libmdbx/src/test/test.vcxproj
+++ b/libs/libmdbx/src/test/test.vcxproj
@@ -78,21 +78,25 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <TargetName>mdbx_test</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <TargetName>mdbx_test</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <TargetName>mdbx_test</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <TargetName>mdbx_test</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-- 
cgit v1.2.3