Implementation of ODBC's setup API

.gitignore

@@ -1,3 +1,5 @@
 *.swp
 driver/*.swp
+builds/*
 cscope.out
+.vs

CMakeLists.txt

@@ -208,7 +208,6 @@ add_custom_target(curlclean
 	WORKING_DIRECTORY "${LIBCURL_PATH_SRC}/winbuild"
 	)
 
-
 message("Driver source files: ${DRV_SRC} .")
 message("Driver include paths: " ${ODBC_INC} ${DRV_SRC_DIR}
 	${LIBCURL_INC_PATH} ${UJSON4C_INC} ${CTIMESTAMP_PATH_SRC})
@@ -223,7 +222,7 @@ target_compile_definitions(${DRV_NAME} PRIVATE "DRIVER_BUILD")
 include_directories(${ODBC_INC} ${DRV_SRC_DIR} ${LIBCURL_INC_PATH}
 	${UJSON4C_INC} ${CTIMESTAMP_PATH_SRC})
 
-target_link_libraries(${DRV_NAME} libcurl)
+target_link_libraries(${DRV_NAME} odbccp32 legacy_stdio_definitions libcurl)
 
 # add testing project/target
 enable_testing()

build.bat

@@ -231,7 +231,7 @@ REM USAGE function: output a usage message
 	echo    setup     : invoke MSVC's build environment setup script before
 	echo                building (requires 2017 version or later^).
 	echo    clean     : remove all the files in the build dir.
-	echo    proper    : clean both the libs and builds dirs and exit.
+	echo    proper    : clean libs, builds and project dirs and exit.
 	echo    nobuild   : skip project building (the default is to build^).
 	echo    type=T    : selects the build type; T can be one of Debug/Release/
 	echo                RelWithDebInfo/MinSizeRel^); defaults to Debug.
@@ -276,6 +276,8 @@ REM PROPER function: clean up the build and libs dir.
 		MSBuild %BUILD_DIR%\curlclean.vcxproj
 	)
 	call:CLEAN
+	REM delete VisualStudio files
+	rmdir /S /Q .vs
 
 	goto:eof
 
@@ -385,7 +387,7 @@ REM BUILD function: build various targets
 		REM file name expansion, cmd style...
 		for /f %%i in ("%DRIVER_BASE_NAME%*.vcxproj") do MSBuild %%~nxi %MSBUILD_ARGS%
 
-		if not ERRORLEVEL 1 if /i not [%ARG:symbols=%] == [%ARG%] (
+		if not ERRORLEVEL 1 if /i not [%ARG:exports=%] == [%ARG%] (
 			dumpbin /exports %CFG_INTDIR%\%DRIVER_BASE_NAME%*.dll
 		)
 	)

devtools/astyle-c.sh

@@ -20,7 +20,7 @@ fi
 # Ensure astyle is available and is of the right version to have all below
 # parameters supported.
 #
-if ! which -s astyle ; then
+if ! which astyle &>/dev/null ; then
     echo "ERROR: The astyle code formatter is not available. Exiting."
     exit 1
 fi

driver/build_def.bat

@@ -3,7 +3,7 @@ REM Helper script to generate the definition file of symbols to export in DLL
 @echo off
 
 REM TODO: find out a smart way for this filtering
-set FILTER="Select-String -Pattern 'SQLRETURN\s+SQL_API\s+\w+'  *.c | %%{ [regex]::split($_, '\s+')[2]; } | %%{ [regex]::split($_, '\(')[0]; }"
+set FILTER="Select-String -Pattern '^\w+\s+SQL_API\s+\w+(\(|$)'  *.c | %%{ [regex]::split($_, '\s+')[2]; } | %%{ [regex]::split($_, '\(')[0]; }"
 
 set DRV_NAME=%1
 set OUTFILE=%2

driver/catalogue.c

@@ -159,6 +159,9 @@ size_t quote_tokens(SQLWCHAR *src, size_t len, SQLWCHAR *dest)
 		}
 		*pos ++ = src[i];
 	}
+	if (copying) {
+		*pos ++ = L'\''; /* end last token */
+	}
 	/* should not overrun */
 	assert(i < 2/*see typ_buf below*/ * ESODBC_MAX_IDENTIFIER_LEN);
 	return pos - dest;