Merge pull request #151 from SamuelMarks/msvc

Microsoft Visual Studio (Windows) support

Author: symisc

.gitignore

@@ -7,3 +7,9 @@ Makefile
 # Binary
 libunqlite.a
 
+# IDEs
+.idea
+.vscode
+
+# Build
+*build*

CMakeLists.txt

@@ -19,13 +19,20 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/src)
 SET(HEADERS_UNQLITE
   unqlite.h
 )
+source_group("Header Files" FILES "${HEADERS_UNQLITE}")
 
 SET(SOURCES_UNQLITE
   unqlite.c
 )
+source_group("Source Files" FILES "${SOURCES_UNQLITE}")
 
 SET(UNQLITE_STATIC_LIB unqlite)
 ADD_LIBRARY(${UNQLITE_STATIC_LIB} ${HEADERS_UNQLITE} ${SOURCES_UNQLITE})
 
 INSTALL(TARGETS ${UNQLITE_STATIC_LIB} COMPONENT devel ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 INSTALL(FILES ${HEADERS_UNQLITE} COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+include(CTest)
+if (BUILD_TESTING)
+  add_subdirectory("example")
+endif (BUILD_TESTING)

example/2.c

@@ -120,10 +120,20 @@ static void PI_Constant(
 static void TIME_Constant(unqlite_value *pValue, void *pUserData /* Unused */)
 {
 	struct tm *pLocal;
+#if defined(_MSC_VER) || defined(__MINGW32__)
+    /* errno_t err; */
+    __time64_t long_time;
+    struct tm newtime;
+    _time64( &long_time );
+    /* err = */ _localtime64_s(&newtime, &long_time);
+    /* if (err != 0) return UNQLITE_INVALID; */
+    pLocal = &newtime;
+#else
 	time_t tt;
 	/* Get the current local time */
 	time(&tt);
 	pLocal = localtime(&tt);
+#endif
 	/* Expand the current time now */
 	unqlite_value_string_format(pValue, "%02d:%02d:%02d", 
 		pLocal->tm_hour, 

example/5.c

@@ -153,23 +153,34 @@ int date_func(
 	int argc,          /* Total number of arguments passed to the function */
 	unqlite_value **argv   /* Array of function arguments*/
 	){
-		time_t tt;
-		struct tm *pNow;
-		/* Get the current time */
-		time(&tt);
+        struct tm *pNow;
+#if defined(_MSC_VER) || defined(__MINGW32__)
+        errno_t err;
+        __time64_t long_time;
+        struct tm newtime;
+        _time64( &long_time );
+        err = _localtime64_s(&newtime, &long_time);
+        if (err != 0) return UNQLITE_INVALID;
+        pNow = &newtime;
+#else
+        time_t tt;
+        /* Get the current time */
+        time(&tt);
 		pNow = localtime(&tt);
-		/* 
-		 * Return the current date.
-		 */
-		unqlite_result_string_format(pCtx, 
-			"%04d-%02d-%02d %02d:%02d:%02d", /* printf() style format */
-			pNow->tm_year + 1900, /* Year */
-			pNow->tm_mday,        /* Day of the month */
-			pNow->tm_mon + 1,     /* Month number */
-			pNow->tm_hour, /* Hour */
-			pNow->tm_min,  /* Minutes */
-			pNow->tm_sec   /* Seconds */
-			);
+#endif
+        /*
+         * Return the current date.
+         */
+        unqlite_result_string_format(pCtx,
+                                     "%04d-%02d-%02d %02d:%02d:%02d", /* printf() style format */
+                                     pNow->tm_year + 1900, /* Year */
+                                     pNow->tm_mday,        /* Day of the month */
+                                     pNow->tm_mon + 1,     /* Month number */
+                                     pNow->tm_hour, /* Hour */
+                                     pNow->tm_min,  /* Minutes */
+                                     pNow->tm_sec   /* Seconds */
+        );
+
 		/* All done */
 		return UNQLITE_OK;
 }
@@ -246,11 +257,21 @@ int array_time_func(unqlite_context *pCtx, int argc, unqlite_value **argv)
 {
 	unqlite_value *pArray;    /* Our JSON Array */
 	unqlite_value *pValue;    /* Array entries value */
-	time_t tt;
 	struct tm *pNow;
 	/* Get the current time first */
-	time(&tt);
+#if defined(_MSC_VER) || defined(__MINGW32__)
+    errno_t err;
+    __time64_t long_time;
+    struct tm newtime;
+    _time64( &long_time );
+    err = _localtime64_s(&newtime, &long_time);
+    if (err != 0) return UNQLITE_INVALID;
+    pNow = &newtime;
+#else
+    time_t tt;
+    time(&tt);
 	pNow = localtime(&tt);
+#endif
 	/* Create a new array */
 	pArray = unqlite_context_new_array(pCtx);
 	/* Create a worker scalar value */
@@ -325,11 +346,21 @@ int object_date_func(unqlite_context *pCtx, int argc /* unused */, unqlite_value
 {
 	unqlite_value *pObject;    /* Our JSON object */
 	unqlite_value *pValue;    /* Objecr entries value */
-	time_t tt;
 	struct tm *pNow;
 	/* Get the current time first */
-	time(&tt);
-	pNow = localtime(&tt);
+#if defined(_MSC_VER) || defined(__MINGW32__)
+    errno_t err;
+    __time64_t long_time;
+    struct tm newtime;
+    _time64( &long_time );
+    err = _localtime64_s(&newtime, &long_time);
+    if (err != 0) return UNQLITE_INVALID;
+    pNow = &newtime;
+#else
+    time_t tt;
+    time(&tt);
+    pNow = localtime(&tt);
+#endif
 	/* Create a new JSON object */
 	pObject = unqlite_context_new_array(pCtx);
 	/* Create a worker scalar value */

example/CMakeLists.txt

@@ -0,0 +1,10 @@
+foreach (name "1" "2" "3" "4" "5" "6" "unqlite_huge" "unqlite_mp3" "unqlite_tar")
+    set(EXEC_NAME "${PROJECT_NAME}_test_example_${name}")
+    set(Source_Files "${name}.c")
+    source_group("${EXEC_NAME} Source Files" FILES "${Source_Files}")
+    add_executable("${EXEC_NAME}" "${Source_Files}")
+    target_link_libraries("${EXEC_NAME}" PUBLIC ${UNQLITE_STATIC_LIB})
+    add_test(NAME "${EXEC_NAME}" COMMAND "${EXEC_NAME}")
+endforeach ()
+
+add_subdirectory(demovfs)

example/demovfs/CMakeLists.txt

@@ -0,0 +1,6 @@
+set(EXEC_NAME "${PROJECT_NAME}_test_example_unqlite_demovfs")
+set(Source_Files "unqlite_demovfs.c")
+source_group("${EXEC_NAME} Source Files" FILES "${Source_Files}")
+add_executable("${EXEC_NAME}" "${Source_Files}")
+target_link_libraries("${EXEC_NAME}" PUBLIC ${UNQLITE_STATIC_LIB})
+add_test(NAME "${EXEC_NAME}" COMMAND "${EXEC_NAME}")