transactd 1.2.0 → 2.0.0

data/source/bzs/env/crosscompile.h

@@ -14,150 +14,165 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #if (defined(__FreeBSD__) || defined(__APPLE__))
-	#ifndef LINUX
-		#define LINUX
-	#endif
+#ifndef LINUX
+#define LINUX
+#endif
 #endif
 
-#if __MINGW32__ && ( (defined(__GNUC__) && __GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ <= 5) )
-	#define sprintf_s	snprintf
-	#define swprintf_s	swprintf
-	#define _mbsstr		strstr
-	#define strcpy_s(A,B,C)		strcpy(A,C)
-	#define strncpy_s(A,B,C,D)	strncpy(A,C,D)
+#if __MINGW32__
+#include "tcharMinGW.h"
+#define strcat_s(A, B, C) strcat(A, C)
+#if (defined(__GNUC__) && __GNUC__ < 4) ||                                     \
+    (__GNUC__ == 4 && __GNUC_MINOR__ <= 5) // 4.5 and lesser
+#define strcat_s(A, B, C) strcat(A, C)
+#define sprintf_s snprintf
+#define swprintf_s swprintf
+#define strcpy_s(A, B, C) strcpy(A, C)
+#define strncpy_s(A, B, C, D) strncpy(A, C, D)
 #ifdef _UNICODE
-	#define _stprintf_s	swprintf_s
-	#define _tcscpy_s	wcscpy_s
-	typedef wchar_t		_TUCHAR;
+#define _stprintf_s swprintf_s
 #else
-	#define _stprintf_s	snprintf
-	#define _tcscpy_s	strcpy_s
-	typedef char		_TUCHAR;
+#define _stprintf_s snprintf
 #endif
 #endif
+int gettimeofday(struct timeval*, struct timezone*);
+#endif // __MINGW32__
 
 #if (defined(LINUX))
-	#include <ctype.h>
-	#include <stddef.h>
-	#include <linuxTypes.h>
+#include <ctype.h>
+#include <stddef.h>
+#include <linuxTypes.h>
 /* c c++ runtime library */
-	#define	_strnicmp 	strncasecmp
-	#define __int64   	long long int
-	#define _atoi64		atoll
-	#define _wtoi(W)	wcstol(W, NULL, 10)
-	#define _access   	access
-	#define sprintf_s	snprintf
-	#define swprintf_s  swprintf
-	#define localtime_s localtime_r
-	#define strncpy_s(A,B,C,D) strncpy(A,C,D)
-	#define strcpy_s(A,B,C) strcpy(A,C) 
-	#define strcat_s(A,B,C) strcat(A,C) 
-	#define _strlwr_s(A,B) _strlwr(A)
-	#define _timezone timezone
-
-	/*if on linux that cannot use multi byte char for meta data.*/
-	#define _mbsstr   	strstr	
-	#define _mbsupr		_strupr 
-	#define _mbsrchr	strrchr
-	#define	_wcsupr		_strupr16
-	#define	_wcslwr		_strlwr16
-	
-	char* _strupr(char* s);
-	char* _strlwr(char* s);
-	char* _ltoa_s(int v, char* tmp, unsigned long size, int radix);
-	char* _i64toa_s(__int64 v, char* tmp, unsigned long size, int radix);
-	char16_t* _strupr16(char16_t* s);
-	char16_t* _strlwr16(char16_t* s);
-	size_t strlen16(const char16_t* src);
-	int wcsnicmp16(const char16_t *sl, const char16_t *sr, size_t n);
-	int wcsncmp16(const char16_t *sl, const char16_t *sr, size_t n);
-	char16_t* wmemset16(char16_t* p , char16_t c, size_t n);
-	char16_t* wmemcpy(char16_t* dest, const char16_t* src, size_t count);
+#define _strnicmp strncasecmp
+#define __int64 long long int
+#define _atoi64 atoll
+#define _wtoi(W) wcstol(W, NULL, 10)
+#define _access access
+#define sprintf_s snprintf
+#define swprintf_s swprintf
+#define localtime_s localtime_r
+#define strncpy_s(A, B, C, D) strncpy(A, C, D)
+#define strcpy_s(A, B, C) strcpy(A, C)
+#define strcat_s(A, B, C) strcat(A, C)
+#define _strlwr_s(A, B) _strlwr(A)
+#define _timezone timezone
+
+/*if on linux that cannot use multi byte char for meta data.*/
+#define _mbsstr strstr
+#define _mbsupr _strupr
+#define _mbsrchr strrchr
+#define _wcsupr _strupr16
+#define _wcslwr _strlwr16
+
+char* _strupr(char* s);
+char* _strlwr(char* s);
+char* _ltoa_s(int v, char* tmp, unsigned long size, int radix);
+char* _i64toa_s(__int64 v, char* tmp, unsigned long size, int radix);
+char16_t* _strupr16(char16_t* s);
+char16_t* _strlwr16(char16_t* s);
+size_t strlen16(const char16_t* src);
+int wcsnicmp16(const char16_t* sl, const char16_t* sr, size_t n);
+int wcsncmp16(const char16_t* sl, const char16_t* sr, size_t n);
+char16_t* wmemset16(char16_t* p, char16_t c, size_t n);
+char16_t* wmemcpy(char16_t* dest, const char16_t* src, size_t count);
 
 /* operating system */
-    #ifndef _TCHAR
-        #define _TCHAR char
-    #endif
-    #ifndef _T
-        #define _T(A) A
-    #endif
-
-	#define PSEPARATOR _T("/")
-	#define PSEPARATOR_A "/"
-	#define PSEPARATOR_C '/'
-	typedef int HWND;
-	#define MAX_PATH 	266
-	#define MCRTOMM		1000  //for usleep(��sec) to Sleep(msec)
-	#define Sleep       usleep
-	#define LoadLibrary(A) 			dlopen(A, RTLD_LAZY)
-	#define LoadLibraryA(A) 		dlopen(A, RTLD_LAZY)
-	#define GetProcAddress(A, B) 	dlsym(A, B)
-	#define FreeLibrary(A)  		dlclose(A)
-	#define OutputDebugString(A) 
+#ifndef _TCHAR
+#define _TCHAR char
+#endif
+#ifndef _T
+#define _T(A) A
+#endif
+
+#define PSEPARATOR _T("/")
+#define PSEPARATOR_A "/"
+#define PSEPARATOR_C '/'
+typedef int HWND;
+#define MAX_PATH 266
+#define MCRTOMM 1000 // for usleep(��sec) to Sleep(msec)
+#define Sleep usleep
+#define LoadLibrary(A) dlopen(A, RTLD_LAZY)
+#define LoadLibraryA(A) dlopen(A, RTLD_LAZY)
+#define GetProcAddress(A, B) dlsym(A, B)
+#define FreeLibrary(A) dlclose(A)
+#define OutputDebugString(A)
 
 /* muliti byete char */
-    typedef char mbchar;
-	typedef char char_m;
-	
+typedef char mbchar;
+typedef char char_m;
+
 #else //!defined(LINUX)
 
-	// define _ttof for MinGW or less than visual studio 2010
-	#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1600)
-		#ifdef _UNICODE
-			#define _ttof _wtof
-		#else
-			#define _ttof atof
-		#endif
-	#endif
+// define _ttof for MinGW or less than visual studio 2010
+#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1600)
+#ifdef _UNICODE
+#define _ttof _wtof
+#else
+#define _ttof atof
+#endif
+#endif
+
+// define char16_t and char32_t for Visual Studio 2008 or earlier, and MinGW
+#if (defined(_MSC_VER) && _MSC_VER < 1600) || defined(__MINGW32__)
+typedef unsigned __int16 char16_t; // 16bit
+typedef unsigned __int32 char32_t; // 32bit
+#endif
 
 /* c c++ runtime library */
-	#include <tchar.h>
-	#if defined(__BORLANDC__) || defined(__MINGW32__)
-		#define _ltow_s(A,B,C,D) _ltow(A, B, D)
-		#define _ltoa_s(A,B,C,D) _ltoa(A, B, D)
-		#define _ltot_s(A,B,C,D) _ltot(A,B,D)
-		#define _i64tow_s(A,B,C,D)  _i64tow(A, B, D)
-		#define _i64toa_s(A,B,C,D)  _i64toa(A, B, D)
-		#define _strlwr_s(A, B) strlwr(A)
-	#endif
-	#define wcsnicmp16(A, B, C)	_wcsnicmp((const wchar_t*)(A), (const wchar_t*)(B) , C)
-	#define wcsncmp16(A, B, C)	wcsncmp((const wchar_t*)(A), (const wchar_t*)(B) , C)
-	#define	wmemset16	wmemset	
-	#define strlen16	wcslen
-	
+#include <tchar.h>
+#if defined(__BORLANDC__) || defined(__MINGW32__)
+#define _ltow_s(A, B, C, D) _ltow(A, B, D)
+#define _ltoa_s(A, B, C, D) _ltoa(A, B, D)
+#define _ltot_s(A, B, C, D) _ltot(A, B, D)
+#define _ultot_s(A, B, C, D) _ultot(A, B, D)
+#define _i64tot_s(A, B, C, D) _i64tot(A, B, D)
+#define _i64tow_s(A, B, C, D) _i64tow(A, B, D)
+#define _i64toa_s(A, B, C, D) _i64toa(A, B, D)
+#define _strlwr_s(A, B) strlwr(A)
+#endif
+
+#if defined(__BORLANDC__)
+#define _strupr strupr
+#define _strnicmp strnicmp
+#endif
+
+#define wcsnicmp16(A, B, C)                                                    \
+    _wcsnicmp((const wchar_t*)(A), (const wchar_t*)(B), C)
+#define wcsncmp16(A, B, C) wcsncmp((const wchar_t*)(A), (const wchar_t*)(B), C)
+#define wmemset16 wmemset
+#define strlen16 wcslen
+
 /* operating system */
-	#define MCRTOMM		1
-	#define  PSEPARATOR _T("\\")
-	#define  PSEPARATOR_A "\\"
-	#define  PSEPARATOR_C '\\'
+#define MCRTOMM 1
+#define PSEPARATOR _T("\\")
+#define PSEPARATOR_A "\\"
+#define PSEPARATOR_C '\\'
 
-	
 /* muliti byete char */
-	typedef unsigned char mbchar;
-	typedef unsigned char char_m;
-	
-#endif//defined(LINUX)
+typedef unsigned char mbchar;
+typedef unsigned char char_m;
 
+#endif // defined(LINUX)
 
 #if (defined(__BORLANDC__) || defined(LINUX))
-	#define localtime_x(_tm, time) localtime_s(time, _tm)
+#define localtime_x(_tm, time) localtime_s(time, _tm)
 #else //!__BORLANDC__
-	#define localtime_x(_tm, time) (localtime_s(_tm, time)==0)
-#endif//__BORLANDC__
+#define localtime_x(_tm, time) (localtime_s(_tm, time) == 0)
+#endif //__BORLANDC__
 
 #ifdef _WIN32
-	#define tls_key DWORD
-	#define tls_getspecific(A) TlsGetValue(A)
-	#define tls_setspecific(A, B) TlsSetValue(A, B)
+#define tls_key DWORD
+#define tls_getspecific(A) TlsGetValue(A)
+#define tls_setspecific(A, B) TlsSetValue(A, B)
 #else
-	#define tls_key pthread_key_t
-	#define tls_getspecific(A) pthread_getspecific(A) 
-	#define tls_setspecific(A, B) pthread_setspecific(A, B)
+#define tls_key pthread_key_t
+#define tls_getspecific(A) pthread_getspecific(A)
+#define tls_setspecific(A, B) pthread_setspecific(A, B)
 #endif
 
-#endif //BZS_ENV_CROSSCOMPILE_H
+#endif // BZS_ENV_CROSSCOMPILE_H

data/source/bzs/env/fileopen.h

@@ -14,8 +14,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 
@@ -23,14 +23,13 @@
 
 inline FILE* fileOpen(const char* filename, const char* flag)
 {
-	FILE* fp; 
+    FILE* fp;
 #ifdef LINUX
-	fp = fopen(filename, flag);
+    fp = fopen(filename, flag);
 #else
-	fopen_s(&fp, filename, flag);
+    fopen_s(&fp, filename, flag);
 #endif
-	return fp;
+    return fp;
 }
 
-
-#endif //BZS_ENV_FILEOPEN_H
+#endif // BZS_ENV_FILEOPEN_H

data/source/bzs/env/mbcswchrLinux.cpp

@@ -12,16 +12,14 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 
 #include "mbcswchrLinux.h"
 #include <stdio.h>
 
-
-
 namespace bzs
 {
 namespace env
@@ -33,8 +31,5 @@ cvt mbu8cvt(UTF8_CHARSETNAME, MBC_CHARSETNAME);
 cvt u8wccvt("UTF-16LE", UTF8_CHARSETNAME);
 cvt wcu8cvt(UTF8_CHARSETNAME, "UTF-16LE");
 
-
-}//namespace env
-}//namespace bzs
-
-
+} // namespace env
+} // namespace bzs

data/source/bzs/env/mbcswchrLinux.h

@@ -14,65 +14,69 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 
 #include <charsetConvert.h>
 
 #define CP_UTF8 65001
-#define CP_ACP  CP_UTF8
-#define GetACP()  CP_ACP
+#define CP_ACP CP_UTF8
+#define GetACP() CP_ACP
 
-#define MBC_CHARSETNAME "SHIFT-JIS"// mbc charctor set
+#define MBC_CHARSETNAME "SHIFT-JIS" // mbc charctor set
 #define UTF8_CHARSETNAME "UTF-8"
 
 namespace bzs
 {
 namespace env
 {
-extern cvt u8mbcvt;// utf8 to mbc
-extern cvt mbu8cvt;// mbc to utf8
-extern cvt mbcscvt;// mbc to utf16le
-extern cvt wchrcvt;// utf16le to mbc
-extern cvt u8wccvt;// utf8 to utf16le
-extern cvt wcu8cvt;// utf16le to utf8
-
-
-inline int WideCharToMultiByte(unsigned int codepage, unsigned int dwFlags
-		, const char16_t* lpWideCharStr,int cchWideChar
-		, char* lpMultiByteStr, int cchMultiByte
-		, const char* lpDefaultChar, int* lpUsedDefaultChar)
+extern cvt u8mbcvt; // utf8 to mbc
+extern cvt mbu8cvt; // mbc to utf8
+extern cvt mbcscvt; // mbc to utf16le
+extern cvt wchrcvt; // utf16le to mbc
+extern cvt u8wccvt; // utf8 to utf16le
+extern cvt wcu8cvt; // utf16le to utf8
+
+inline int WideCharToMultiByte(unsigned int codepage, unsigned int dwFlags,
+                               const char16_t* lpWideCharStr, int cchWideChar,
+                               char* lpMultiByteStr, int cchMultiByte,
+                               const char* lpDefaultChar,
+                               int* lpUsedDefaultChar)
 {
-	if (codepage == CP_UTF8)
-		return wcu8cvt.conv(lpWideCharStr, (size_t)(cchWideChar + cchWideChar), lpMultiByteStr, (size_t)cchMultiByte);		
-	return wchrcvt.conv(lpWideCharStr, (size_t)(cchWideChar + cchWideChar), lpMultiByteStr, (size_t)cchMultiByte);	
+    if (codepage == CP_UTF8)
+        return wcu8cvt.conv(lpWideCharStr, (size_t)(cchWideChar + cchWideChar),
+                            lpMultiByteStr, (size_t)cchMultiByte);
+    return wchrcvt.conv(lpWideCharStr, (size_t)(cchWideChar + cchWideChar),
+                        lpMultiByteStr, (size_t)cchMultiByte);
 }
 
-inline int MultiByteToWideChar(unsigned int codepage, unsigned int dwFlags, const char* lpMultiByteStr
-			,int cchMultiByte, char16_t* lpWideCharStr, int cchWideChar)
+inline int MultiByteToWideChar(unsigned int codepage, unsigned int dwFlags,
+                               const char* lpMultiByteStr, int cchMultiByte,
+                               char16_t* lpWideCharStr, int cchWideChar)
 {
-	if (codepage == CP_UTF8)
-		return u8wccvt.conv(lpMultiByteStr, (size_t)cchMultiByte, lpWideCharStr, (size_t)(cchWideChar + cchWideChar));		
-	return mbcscvt.conv(lpMultiByteStr, (size_t)cchMultiByte, lpWideCharStr, (size_t)(cchWideChar + cchWideChar));	
+    if (codepage == CP_UTF8)
+        return u8wccvt.conv(lpMultiByteStr, (size_t)cchMultiByte, lpWideCharStr,
+                            (size_t)(cchWideChar + cchWideChar));
+    return mbcscvt.conv(lpMultiByteStr, (size_t)cchMultiByte, lpWideCharStr,
+                        (size_t)(cchWideChar + cchWideChar));
 }
 
 inline int u8tombc(const char* u8, int u8size, char* mbc, int mbcsize)
 {
-	return u8mbcvt.conv(u8, (size_t)u8size, mbc, (size_t)mbcsize);
+    return u8mbcvt.conv(u8, (size_t)u8size, mbc, (size_t)mbcsize);
 }
 
 inline int mbctou8(const char* mbc, int mbcsize, char* u8, int u8size)
 {
-	return mbu8cvt.conv(mbc, (size_t)mbcsize, u8, (size_t)u8size);
+    return mbu8cvt.conv(mbc, (size_t)mbcsize, u8, (size_t)u8size);
 }
 
+} // namespace env
+} // namespace bzs
 
-}//namespace env
-}//namespace bzs
-
-//Definition dummy
+// Definition dummy
 #define MB_PRECOMPOSED 0
 #define WC_COMPOSITECHECK 0
 
@@ -81,8 +85,7 @@ using bzs::env::MultiByteToWideChar;
 
 // Surrogate support
 #if !defined IS_HIGH_SURROGATE
-#define IS_HIGH_SURROGATE(t)  ((t >= 0xD800) && (t <= 0xDBEF))
+#define IS_HIGH_SURROGATE(t) ((t >= 0xD800) && (t <= 0xDBEF))
 #endif
 
-
-#endif //BZS_ENV_MBCSWCHRLINUX_H
+#endif // BZS_ENV_MBCSWCHRLINUX_H

data/source/bzs/env/tcharMinGW.h

@@ -0,0 +1,59 @@
+#ifndef BZS_ENV_TCHARMINGW_H
+#define BZS_ENV_TCHARMINGW_H
+/* =================================================================
+ Copyright (C) 2000-2014 BizStation Corp All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+ ================================================================= */
+#if __MINGW32__ && defined(__GNUC__)
+
+#ifdef _UNICODE
+
+#define _tcsncpy_s wcsncpy_s
+
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 5) // 4.5 and lesser
+#define _tcscpy_s wcscpy_s
+#define _tcscat_s wcscat_s
+typedef wchar_t _TUCHAR;
+#elseif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5) // 4.6 and grater
+#define _tcsstr wcsstr
+#define _tcscmp wcscmp
+#define _tcschr wcschr
+#define _tcsrchr wcsrchr
+#define _tcsncpy wcsncpy
+#define _tcsicmp _wcsicmp
+#endif
+
+#else // NOT _UNICODE
+
+#define _tcsncpy_s strncpy_s
+
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 5) // 4.5 and lesser
+#define _tcscpy_s strcpy_s
+#define _tcscat_s strcat_s
+typedef char _TUCHAR;
+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5) // 4.6 and grater
+#define _tcsstr strstr
+#define _tcscmp strcmp
+#define _tcschr strchr
+#define _tcsrchr strrchr
+#define _tcsncpy strncpy
+#define _tcsicmp strcasecmp
+#endif
+
+#endif // _UNICODE
+#endif // __MINGW32__ && defined(__GNUC__)
+#endif // BZS_ENV_TCHARMINGW_H