diff --git a/COPYING b/COPYING index 9b8b78ea..0c52994c 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,6 @@ iODBC Driver Manager Copyright (C) 1995 by Ke Jin -Copyright (C) 1996-2016 by OpenLink Software +Copyright (C) 1996-2019 by OpenLink Software All Rights Reserved. This software is released under either the GNU Library General Public diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 00000000..7a33a917 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,2503 @@ +2019-07-23 Patrick van Kleef + + Merge branch 'feature/pthread_fix' into develop + + Fixed small memory leaks + + Fixed issue with memory use after free and potential memory leak + +2019-07-10 Patrick van Kleef + + Fixed issue holding global lock too long in SQLError, SQLGetDiagRec and SQLGetDiagField + +2019-07-09 Patrick van Kleef + + Disable empty initialization block + +2019-06-25 Patrick van Kleef + + Merge branch 'feature/fixes' into develop + + Removed unneeded checks + + Fixed package versioning + + Fixed issue with arg expansion while generating config.nice script + +2019-06-25 Sergey Malinin + + Fixed missing check for section + + Fixed issue using heap after free in SQLConnect_internal + + Fixed issue in Mac Cocoa code + +2019-05-02 Sergey Malinin + + Fixed SQLSetStmtAttr to cache the correct values for SQL_ATTR_ROW_ARRAY_SIZE and SQL_ATTR_ROW_BIND_TYPE + + Closes: 35 + +2019-05-02 Sergey Malinin + + Added missing define SQL_CONVERT_GUID + + Closes: 31 + +2019-01-01 Patrick van Kleef + + Updated Copyright to include 2019 + +2018-06-26 Adam Majer + + non-void function needs to return a value + +2018-06-26 Sam Hatchett + + fixes an issue where build fails on Alpine + +2018-06-26 Patrick van Kleef + + Added extra validation for SQLAllocHandle (SQL_HANDLE_DESC, ...) + + Fixed valgrind reporting write after free in SQLFreeHandle + +2018-01-02 Patrick van Kleef + + Updated Copyright to 2018 + +2017-11-01 iODBC Maintainer + + Updated BUILD id to 171101 + +2017-11-01 Sergey Malinin + + Fix iODBC crash issue https://github.com/openlink/iODBC/issues/23 + +2017-11-01 iODBC Maintainer + + Fixed format specifiers and some casts to fix trace output + + Added GCC __attribute__ for checking format string + +2017-01-11 Sergey Malinin + + Fix iODBC apps/frameworks CFBundleGetInfoString attribute + +2017-01-10 iODBC Maintainer + + Updated copyright to include 2017 + +2016-11-02 iODBC Maintainer + + Fixed typo + +2016-07-12 iODBC Maintainer + + Merge branch 'release/3.52.12' into develop + + Updated version to 3.52.12 for final release + + Updated NEWS and changelog + + Fixed artifact in text conversion + + Updated build number to 160712 for release + + Regenerated text versions of README*.md files + + Updated README files and converted them to MarkDown format + + Fixed compiler warning + +2016-07-07 Patrick van Kleef + + Fixed autoconf/automake warning + + Renamed configure.in to configure.ac + + Renamed bootstrap.sh to autogen.sh + +2016-07-07 iODBC Maintainer + + Removed deprecated file + + Merge branch 'feature/remove_carbon' into develop + + Fixed indentation + +2016-07-05 iODBC Maintainer + + Fixed typo + +2016-07-04 iODBC Maintainer + + Ignore mac build directories + + Removed hooks to call graphical bundles if not building frameworks + + Fixed EXTRA_DIST to package all the new Cocoa based code + + Fixed issues building on Mac OS X 10.10 and 10.11 + + Renamed mac_cocoa/ -> mac/ + + Removed old Carbon based UI code + +2016-06-21 Sergey Malinin + + Fix UI + + - rename title of dialog to "iODBC Data Source Administrator (64-Bit Edition)" for 64bit version + - fix crash for ODBC Driver Add and Configure UI + +2016-06-13 Sergey Malinin + + Update iODBC UI + + - update behavior for DoubleClick action in DSNchoose(execute OK) and DSNmanage(execute Configure) dialogs + - rewrite loader of file list for FileDSN to Cocoa + +2016-06-08 Sergey Malinin + + Fix missprint + + Update for OS X Office2016 fix for recreate properly link, when source file was deleted and recreated + +2016-06-07 Sergey Malinin + + Fix issue with MSOffice2016 and UserDSN access + +2016-06-07 iODBC Maintainer + + Fixed pool alloc + +2016-06-06 Sergey Malinin + + Fix FileDSN tab, new button was added for choose FileDSN dir + +2016-06-03 Sergey Malinin + + Fix issue when dialog getting lost behind another dialog + +2016-06-02 Sergey Malinin + + Fix double free issue and update xib file for resolve resource compilation issue + +2016-05-31 iODBC Maintainer + + Updated copyright to include 2016 + +2016-05-30 Sergey Malinin + + Fix Memory alloc issues in iODBC + +2016-05-26 iODBC Maintainer + + Updated version to 3.52.12-dev to start next development cycle + + Merge branch 'feature/2015_08_11_CocoaPort' into develop + +2016-05-26 Sergey Malinin + + Fix typo 'divers' => 'drivers' + +2016-05-26 Sergey Malinin + + Fix iODBC DM + + - improve the starting speed of iODBC DM + - fix UI names 'iODBC Administrator' => 'iODBC Administrator64' in iODBC Administrator64.app + +2016-05-26 Sergey Malinin + + Fix TLOGIN structure + + Fixed issue with Proxy Login/Setup dialogs + + Rename Makefiles + + Fix resource localised paths and split iODBCDemo package on two packages + + Remove cfrelease(bundle_dll) calls in connect.c + + Remove cfrelease(bundle_dll) calls + + Add latest changes + + Fix permissions + +2016-05-26 Sergey Malinin + + Add latest fixes for CocoaPort + + - convert UI dialogs for Xcode4.6 format + - fix issue with release bundle ref + - update version to 3.52.12 + +2016-05-26 Sergey Malinin + + Fix iODBCdemo resources + + Fix func for conversion char/wchar to NSString + + Fix permissions + + Fix UI, rename iODBCAdminitirator64bit to iODBCAdminitirator64 + + Fix iODBCadministrator + + Fix year and update iODBC Administrator + + Port iODBC DM to Cocoa UI + +2016-05-26 iODBC Maintainer + + Merge branch 'release/3.52.11' into develop + + Updated version to 3.52.11 for internal release + +2016-03-10 iODBC Maintainer + + Added xcodebuild option for Mac OS X 10.11 + + Fixed issue with Xcode on Mac OS X 10.10 Xcode 7.2.1 + + Fixed use only major.minor of Mac OS X version to configure flags + +2016-03-03 iODBC Maintainer + + Updated build numbers + + Fixed merge issue + + Updated Copyright to 2016 + +2016-03-03 Bo Anderson + + Fixed iODBCdrvproxy XIBs not compiling to NIBs on OS X. + +2016-01-12 iODBC Maintainer + + Updated Copyright to 2016 + +2015-09-28 OpenLink Software + + Merge pull request #13 from Bo98/drvproxy-nib-fix + + Fixed iODBCdrvproxy XIBs not compiling to NIBs on OS X + +2015-09-28 OpenLink Software + + Merge pull request #10 from Bo98/drvconn-free-fix + + Fixed crash when passing an empty connect string with no window handle + +2015-09-28 OpenLink Software + + Merge pull request #11 from Bo98/osx-dev-build-fixes + + Fixed iODBCadm and iODBCdrvproxy Development build errors on OS X + +2015-09-28 OpenLink Software + + Merge pull request #12 from Bo98/create_dsnsetup-crash-fix + + OS X: Fixed crash when create_dsnsetup fails to load the window + +2015-09-28 Bo Anderson + + Fixed iODBCdrvproxy XIBs not compiling to NIBs on OS X. + + Fixed crash when create_dsnsetup fails to load the window. + + Fixed iODBCadm and iODBCdrvproxy Development build errors on OS X. + + Fixed crash when passing an empty connect string with no window handle. + +2015-07-21 Sergey Malinin + + Fix iODBCdemo issue with UID/PWD values + +2015-07-17 Sergey Malinin + + Added support for x86_64 to iODBC Demo + +2015-07-15 Sergey Malinin + + Fix crash ODBCdemo - error message overwrite stack data + +2015-07-13 Sergey Malinin + + Fixed crash in iODBC DM on push of "Test" button when 64bit ODBC driver is used. + +2015-02-27 Sergey Malinin + + Fixed issue in SQLGetInfo + +2015-02-10 iODBC Maintainer + + Merge branch 'hotfix/3.52.10.1' into develop + + Added missing file to distribution + + Updated version to 3.52.11-dev to signal start of new development cycle + + Merge branch 'release/3.52.10' into develop + + Merge branch 'release/3.52.10' + + Updated NEWS + + Updated version number to 3.52.10 for final release + + Added missing files from distribution + +2015-02-06 Sergey Malinin + + Fix Unicode conversion issues + + - SQLGetDiagField(,,,SQL_DIAG_MESSAGE_TEXT,,,) - possible memory overwrite + - SQLGetDiagField() - output string truncation when SQLGetDiagFieldW is call with ANSI ODBC driver + - SQLGetConnectAttr() - output string truncation when SQLGetConnectAttrW is call with ANSI ODBC driver + - SQLGetDescField() - output string truncation when SQLGetDescFieldW is call with ANSI ODBC driver + - SQLColAttribute() - output string truncation when SQLColAttributeW is call with ANSI ODBC driver + +2015-02-05 iODBC Maintainer + + Updated version to 3.52.10-rc1 for upcoming release + + Updated NEWS + + Updated version strings to 3.52.10 for upcoming release + +2015-02-05 Sergey Malinin + + Fixed UI elements + + * Use SingleLine attribute for all textFields + * Fixed messages below the various tabs + +2015-01-31 iODBC Maintainer + + Install iODBC Administrator in /Applications/iODBC/ + +2015-01-31 Patrick van Kleef + + Ignore error if directory already exists + + Renamedd OpenLink ODBC Administrator to iODBC Administrator + + Fixed About dialog and other text to make a more generic Administrator + +2015-01-31 Sergey Malinin + + Fixed FileDSN default path + + From /Library/ODBC/ODBCDataSources => $HOME/Documents + +2015-01-31 Sergey Malinin + + Fixed FileDSN save dialog and Set Trace file option + +2015-01-29 iODBC Maintainer + + Fixed app names/titles to iODBC Demo Unicode and iODBC Demo Ansi + + Fixed permissions + +2015-01-29 Sergey Malinin + + Updated iODBCdemo on Mac OS X to support blue links in gridView + +2015-01-28 Sergey Malinin + + Fixed issue with ~/Library/ODBC/odbc[inst].ini on Mac OS X + + iODBC creates ~/.odbc[inst].ini when ~/Library/ODBC/odbc[inst].ini does not exist + * If $HOME/.odbc[inst].ini exists, import it and after this + replace it with link to $HOME/Library/ODBC/.odbc[inst].ini + * open $HOME/Library/ODBC/odbc[inst].ini always and doesn't use $HOME/odbc[inst].ini + +2015-01-21 Sergey Malinin + + Fixed Mac OS X file chooser dialogs to return long file names + +2015-01-07 iODBC Maintainer + + Fixed About + + Fixed branding + + Fixed typo + + Added build support for Mac OS X 10.10 + + Updated About dialogs + + Updated copyright to include 2015 + +2015-01-06 iODBC Maintainer + + Updated iODBC version timestamp + +2015-01-06 Sergey Malinin + + Fix - OSX iODBC Demo.app shows gridView with columns, that could not be resized, for "SPARQL DESCRIBE..." queries + +2015-01-05 iODBC Maintainer + + Updated copyright to include 2015 + +2014-04-15 iODBC Maintainer + + Updated version to 3.52.10-dev to signal start of new development cycle + + Merge branch 'release/3.52.9' into develop + + Merge branch 'release/3.52.9' + + Updated Debian build files + + Updated iODBC package version to 3.52.9 for final release + +2014-04-15 Patrick van Kleef + + Updated NEWS + + Merge fixes + +2014-04-15 iODBC Maintainer + + Added support for Mac OS X 10.9 + +2014-04-15 Patrick van Kleef + + Removed ChangeLog as it is generated + + Added unix build directories to ignore list + +2014-04-15 Patrick van Kleef + + Partially reverted recent change for version autoconf/libtool + + Recent changes did not work properly with the minimum required versions + of autoconf and libtool + +2014-04-15 Patrick van Kleef + + Updated files to reflect minimum versions of autoconf/automake/libtool + +2014-04-01 iODBC Maintainer + + Updated version to 3.32.9-dev + +2014-04-01 Sergey Malinin + + Miscellaneous fixes from a developer from Teragram + + configure.in: + + * Rewrote the "underscore before symbols" code snippet to eliminate + warnings (e.g. improper main() prototype) and potential optimizing-out + of the fnord() function + * Use ${CFLAGS} with ${CC}, as the former may contain important flags + * Fail if pthread.h is not found, otherwise the configuration falls into + a state where threading is enabled, but the header is missing + + include/sqltypes.h: + * Need to check whether _MSC_VER is defined before using it in a cpp + conditional, otherwise -Wundef gives a warning + + iodbc/dlproc.h: + * Simplified the conditional affecting the definition of HDLL. (Is there + any non-Win32 system that provides this type?) + + http://sourceforge.net/p/iodbc/mailman/message/29560355/ + +2014-04-01 Sergey Malinin + + Build system updates + + ++ acinclude.m4 + * Properly quote macro name in AC_DEFUN + * Use AC_LINK_IFELSE instead of the obsolete AC_TRY_LINK + + ++ admin/gtk-2.0.m4, admin/gtk.m4 + * Properly quote macro name in AC_DEFUN + + ++ bootstrap.sh + * Call the various Autotools initialization programs with --warnings=all + where applicable, to help with QA (and autoconf also gets no-obsolete so + we don't hear about the obsolete usages still in the GTK m4 macros) + + ++ configure.in + * Use AC_CONFIG_HEADERS instead of the obsolete AM_CONFIG_HEADER + * Use AS_HELP_STRING instead of the obsolete AC_HELP_STRING + * Don't use A[CS]_HELP_STRING inside an echo "...", as this is not how the + macro is intended to be used, and it doesn't do much good anyway + * Use AM_PROG_CC_C_O because AC_PROG_CC_C_O is not sufficient + * Replaced the obsolete AC_LIBTOOL_DLOPEN and AM_PROG_LIBTOOL macros with + a call to LT_INIT + * Fixed the doc string for --disable-gui + * Use AC_RUN_IFELSE instead of the obsolete AC_TRY_RUN + * Can't use a variable in the doc string for --with-iodbc-filedsnpath, so + replaced "$inidir" with "INIDIR" + * Rewrote the config info summary at the end to use "cat < + + Fixed infinite loop in connection pool + + http://sourceforge.net/p/iodbc/mailman/message/29986083/ + +2014-04-01 Sergey Malinin + + Fix build warning messages and using "strlen" function with unicode data + + - fix build warning messages + - fix using strlen with unicode data + +2014-04-01 Sergey Malinin + + Fix check, if Unicode driver is used + + http://sourceforge.net/p/iodbc/mailman/message/31801152/ + +2014-04-01 iODBC Maintainer + + Merge branch 'feature/fix_pkg_config_and_odbc_config' into develop + + Fixed typo + +2014-04-01 Sergey Malinin + + Fixes for the pkg-config file and iodbc-config + + http://sourceforge.net/p/iodbc/mailman/message/29721400/ + +2014-04-01 Sergey Malinin + + Fix issue, when SQLCancel is call from another thread + + From a developer at MySQL/Sun/Oracle, an issue with SQLCancel() + http://sourceforge.net/p/iodbc/mailman/message/31944526/ + +2014-03-27 Sergey Malinin + + SQLInstallDriverEx does not work when driver library is read-only + +2014-02-17 iODBC Maintainer + + Updated copyright year + +2013-01-08 iODBC Maintainer + + Fixed missing declaration + + Fixed issue with dladdr prototype on linux + + Fixed issue with build dependancy when using make -j6 + + Fixed compiler warnings on newer Xcode compilers Mac OS X + + Added support for Mac OS X 10.8 + + Added support for Mac OS X 10.8 + + Fixed issue with SDKs path on Mac OS X 10.7 + + Added support for Mac OS X 10.7 + + Fixed deprecated macro + +2013-01-04 Patrick van Kleef + + Updated copyright to include 2013 + +2012-03-27 Patrick van Kleef + + Added missing file + +2012-03-27 Patrick van Kleef + + Merge branch 'release/v3.52.8' into develop + + Merge branch 'release/v3.52.8' + + Updated documentation + + Added info to NEWS + + Updated changelog + + Updated version number to 3.52.8 + + Added support for Mac OS X 10.7 + +2012-03-26 Patrick van Kleef + + Fixed list of files to be distributed + + Updated version to 3.52.8-rc1 + + Removed old .cvsignore files + + Merge branch 'feature/mac_ui' into develop + + Updated version of iODBC Demo to 1.1 + + Converted build rules to compile the UI from new .xib files + + Fixed problem installing CFMSupport + + Converted old .nib format to .xib format + + Added Mac OS X build files to ignore list + + Added more files to ignore + + Added initial .gitignore + +2012-03-12 Patrick van Kleef + + * Updated copyright to 2012 + +2011-08-10 Patrick van Kleef + + * Fixed issue with using buffer after free + + * Updated copyright year + +2010-09-04 Patrick van Kleef + + * Fixed use ssize_t where appropriate + + * Fixed compiler warning + + * Fixed version info + + * Fixed warnings + + * Fixed issue with strlen if param can be NULL + + * Fixed use ssize_t for length of string * Fixed tracing SQLGetData using multiple chunks * Fixed problem tracing on big-endian machines + + * Removed unused variables + + * Fixed wrong type label + +2009-09-10 Patrick van Kleef + + * Fixed version + + *** empty log message *** + + *** empty log message *** + + * Updated version of package to 3.52.7 for final release * Updated library versions + + * Fixed loading libdrvproxy.so.2 and libiodbcadm.so.2 using major version number. * Removed libdrvproxy.{a|so} and libiodbcadm.{a|so} from packaging since they are not development libraries that user applications should try to link with. + + * Fixed instructions + + *** empty log message *** + + * Fixed distribution packaging + +2009-09-09 Patrick van Kleef + + * Removed deprecated file + + * Removed space from file name + + * Moved iodbcunix.h from sql.h to sqltypes.h + + * Fixed description + + * Updated debian files + + * Fixed compiler warnings + + * Updated version info + + * Fixed compile flags + + * Fixed check for wchar.h on Mac framework build + + * Moved symbol files + + * Added install rules for iODBC CFM bridge + + * Added iODBC CFM Bridge code + + * Added support for overruling CFLAGS, CC and other environment vars + + * Updated Mac OS X build instructions + + * Fixed building/installing iODBC Demo Unicode version * Removed sudo from rules, user should perform 'sudo make install" + +2009-09-08 Patrick van Kleef + + * Fixed portability between various versions of Mac OS X + + * Updated version info + + * Added support for building solaris 2.10 on AMD64 and Sparc + + * Added support for Mac OS X 10.6 + + *** empty log message *** + + * Added defines for Virtuoso ODBC SPASQL extensions + + * Fixed case label for x86_64 linux systems + + * Fixed compiler warning + + * FIxed namespace for internal dlopen functions + + * Added support for Mac OS X 10.6 + + * Added support for Mac OS X 10.5 + +2009-09-07 Patrick van Kleef + + * Fixed allow installation in temp directory structure + + * Fixed typo + + * More files to ignore + + * Fixed install rules + + * Fixed copyright year + + * Fixed support to quit application from decoration + + * Added iODBCdemo sample program for Mac OS X + +2009-09-02 Patrick van Kleef + + * Fixed prototype + + * Fixed find relevant section instead of reading all entries in the file + +2009-09-01 Patrick van Kleef + + *** empty log message *** + + * Ignore files from libtool 2.x + + * Set minimum requirement for auto* tools to match RedHat Enterprise 4 + + * Use newer RPM macros for building to fix building on x86_64 * Fixed configure to completely disable building UI extensions when using rpmbuild --define 'noadmin 1' ..... + + * Fixed prototype + + *** empty log message *** + + *** empty log message *** + + * Fixed group box size + +2009-08-31 Patrick van Kleef + + * Fixed wrong text on tab + +2009-08-30 Patrick van Kleef + + *** empty log message *** + + * Fixed unload bug deref wrong pointer + + * Added support for $S (sequence number) in TraceFile + + * When tracefile length has reached its limit, try to open a new tracefile + + * Fixed default window sizes + + * Fixed typos + + * Fixed typos + + * Updated copyright year to 2009 + + * Fixed licensing information + + * Fixed GTK based administrative code to use resizable windows + +2009-06-24 Patrick van Kleef + + * Updated release number + +2009-02-23 Patrick van Kleef + + * Moved Mac OS X gui components + + * Moved Mac OS X gui components + +2009-02-16 Patrick van Kleef + + * Added support for Mac OS X 10.5 + + * Fixed missing function + + * Removed old endif + +2009-01-30 Sergey Malinin + + * Added additional translations between unicode and ansi components (sm) + + * Added additional translations between unicode and ansi components (sm) + +2008-10-30 Patrick van Kleef + + * Updated spec file to latest standards + +2008-04-25 Patrick van Kleef + + * Fixed Connection Pooling UI + +2008-03-14 Patrick van Kleef + + * Fixed bug checking for odbc_ver on connect handle + +2007-10-08 Patrick van Kleef + + * Updated version to 3.52.6 for final release (pvk) + + *** empty log message *** + + * Updated version to 3.52.6 for final release (pvk) + + *** empty log message *** + + * Fixed problem returning memory allocation error when max length of buffer was set to 0. + +2007-10-07 Patrick van Kleef + + *** empty log message *** + + * Updated instructions to get CVS tree from sourceforge archive + + * Fixed checking for driver version when not connected + + * Fixed typo + + * Fixed for openbsd + + * Fixed towlower on older Mac OS X systems * Use dummy towlower on systems that have no native support + + * Fixed wchar check for FreeBSD 4.8 (pvk) + + * Fixed checking pthread library on OSF 3.x and OSF 4.x (pvk) + + * Fixed problem with C variable scope (pvk) + +2007-10-02 Patrick van Kleef + + * Removed AutoReqProv:no setting + +2007-10-01 Patrick van Kleef + + * Disabled building/installing old libodbc.a as this can interfere with other driver managers * Fixed License keyword * Updated version of rpm + +2007-09-10 Patrick van Kleef + + * Don't keep odbc mutex unnecessary long + + * Split locking section into smaller segements + +2007-09-04 Patrick van Kleef + + * Fixed typos + + * Fixed return code when driver could not be found + + * Fixed error messages + + * Use SQLFetchScroll on ODBC 3.x + + * Added missing SQLStmtOptionA to export list + + * Fixed checking for driver version when not connected + +2007-02-02 Sergey Malinin + + * Added initial support for gtk+ 2.x (sm) + + * Fixed Unicode bug in SQLBrowseConnect * Added SQLBrowseConnectW to export-symbol list (sm) + +2007-01-08 Patrick van Kleef + + * Minor text changes (pvk) + +2007-01-05 Patrick van Kleef + + *** empty log message *** + + * Updated version to 3.53.5 (pvk) + + * Added support for RedHat FC6 64bit (pvk) + + *** empty log message *** + + * Reverted incomplete patch (pvk) + +2007-01-03 Sergey Malinin + + * Fixed buffer size calculation (sm) + + * Fixed problem connecting with FileDSN (sm) + + * Fixed missing newline when showing parameters (sm) + +2006-12-21 Patrick van Kleef + + * Increased limit of tracedump char and hex data to 1000 lines max (pvk) + + * Limit the size of the tracefile to about 1Gb (pvk) + +2006-12-21 Sergey Malinin + + * Fixed problems with FileDSN in GTK build (sm) + +2006-12-15 Patrick van Kleef + + * Updated version to 3.52.5-rc2 + + * Added configure option to set default FileDSN directory (pvk) + +2006-12-15 Sergey Malinin + + * Allow user to bypass connection check when adding a FileDSN (sm) + +2006-12-12 Patrick van Kleef + + * Removed bogus free (pvk) + + * Removed duplicate error message box (pvk) + +2006-12-11 Patrick van Kleef + + * Incorporated diff from debian web site (pvk) + + * Updated version to 3.52.5-rc1 + + * Fixed problem when driver has not yet been connected (pvk) + + * Use SQL_SUCCEEDED macro to increase readability (pvk) + + * Fixed problem always returning SQL_ERROR due to logic bug (pvk) + + * Call ODBC 2.x functions in driver if application uses ODBC 2.x only (pvk) + +2006-09-25 Sergey Malinin + + * Call ODBC 2.x functions in driver if application uses ODBC 2.x only (sm) + +2006-08-03 Patrick van Kleef + + * Added missing header to distribution + +2006-07-17 Patrick van Kleef + + * Removed procid reference from code and simplified call mechanism (pvk) + +2006-07-11 Patrick van Kleef + + * Simplified CALL_DRIVER and CALL_UDRIVER macros + +2006-07-10 Patrick van Kleef + + * Merged FileDSN and ConnectionPooling support from iODBC-3_52_4-DEVEL + + * Merged FileDSN and ConnectionPooling support from iODBC-3_52_4-DEVEL + + * Merged FileDSN support from iODBC-3_52_4-DEVEL into HEAD + + * Use highlighting in overview screen (pvk) + + * Rewrote bootstrap script to be more verbose about programs/versions needed (pvk) + +2006-04-27 Sergey Malinin + + * Skip {..} when parsing connect string (sm) + +2006-03-21 Patrick van Kleef + + * Use localtime_r (pvk) + +2006-03-06 Patrick van Kleef + + * Fixed typo in function prototype (pvk) + +2006-03-03 Patrick van Kleef + + * Updated Info strings (pvk) + +2006-02-24 Sergey Malinin + + * Let the driver manager call the setup dialogs for now and then call the driver with SQL_DRIVER_NOPROMPT (sm) + +2006-02-13 Patrick van Kleef + + * Version information is inserted by installer scripts (pvk) + + * Added sccid to all sections to get string with load type into binary (pvk) + +2006-02-08 Patrick van Kleef + + * Remove ppc64 from universal builds (pvk) + +2006-02-03 Patrick van Kleef + + * Fixed include file problem on Mac OS X 10.3 (pvk) + + * Added realclean rule (pvk) + +2006-01-26 Patrick van Kleef + + *** empty log message *** + + * Finalized iODBC-3.52.4 release (pvk) + + * Updated version number to 3.52.4 (pvk) + + * Add -Wl,+s to HP/UX builds to enable SHLIB_PATH handling (pvk) + + * Moved darwin specific -DNO_FRAMEWORKS from PORT.OpenLink to configure.in * Updated build instructions for Mac OS X (pvk) + + * Updated version number and build number in preparation for release (pvk) + + * Fixed copyright notice (pvk) + + * Added missing include directory (pvk) + +2006-01-25 Patrick van Kleef + + * Added project files for Mac OS X 10.4 Universal builds (pvk) + + * Make it easier to change buildstyles (pvk) + + * Fixed order in which targets need to be installed (pvk) + + * Converted Xcode project files for Mac OS X 10.4 Universal builds (pvk) + + * Fixed bug in determining which version of Mac OS X we build on (pvk) + + * Cleanup Mac OS X project files (pvk) + + * Cleanup Mac OS X project files (pvk) + + * Cleanup Mac OS X project files (pvk) + + * Updated version number (pvk) + +2006-01-24 Patrick van Kleef + + * Simplified building process (pvk) + + * Fixed include paths (pvk) + + * Fixed wchar_t issue on Mac OS X (pvk) + + * Added new version macros for Mac OS X build (pvk) + + * Fixed building and installing iodbctest and iodbctestw (pvk) + + * Files to ignore (pvk) + + * Added guard against including sqlext.h twice (pvk) + + * Fixed include paths building on Mac OS X (pvk) + + * Added proper header file for prototypes * Fixed typo in function name (pvk) + + * Fixed compiler warnings (pvk) + + * Fixed some compiler warnings (pvk) + +2006-01-20 Patrick van Kleef + + * Clarify which version of the LGPL license this project adheres to (pvk) + + * Fixed temporary framework search paths * Fixed framework version for non-standard build (pvk) + + * Moved dlf.[ch] and unicode.[ch] to iodbcinst (pvk) + + * Use iodbcinst_common and gtk/libdrvproxy-gtk.la convenience libraries instead of referring to individual object files (pvk) + + * Use iodbcinst_common and gtk/libiodbcadm-gtk.la convenience libraries instead of referring to individual object files (pvk) + + * Added more functions to export (pvk) + + * Use new iodbcinst_common library so iodbc does not need to be linked against libiodbcinst. This created problems on various platforms like HP/UX with static link paths being inserted into the libiodbc.so library (pvk) + + * Created convenience library with common objects that are used in more than one place (pvk) + + * Moved dlf.[ch] and unicode.[ch] to iodbcinst (pvk) + + * Moved confirm.c and question.xpm from drvproxy/gtk to iodbcadm/gtk (pvk) + +2006-01-18 Patrick van Kleef + + * If towlower does not exist and we cannot use Frameworks, then just return the original character (pvk) + + * Added support for Mac OS X 10.2 (pvk) + + * On AIX we prefer the cc_r7 compiler instead of the cc compiler (pvk) + + * Temporarily disabled --disable-odbc3 untill all parts of iODBC DM have been fixed to compile with ODBCVER=0x0250 (pvk) + + * Unicode and ANSI functions did not exist in ODBC 2.50 (pvk) + +2006-01-17 Patrick van Kleef + + * Fixed errors when compiling iODBC for ODBC 2.50 specs (pvk) + + * Fixed ODBCVER (pvk) + +2006-01-13 Patrick van Kleef + + * Added support for SUSE Linux on AMD opteron (pvk) + + * Added missing header files for function prototypes (pvk) + +2006-01-12 Patrick van Kleef + + * Added support for building on Apple Mac OS X 10.4 ppc, ppc64 and i386 all in one (pvk) + +2006-01-11 Patrick van Kleef + + * Allow # as extra comment character on reading the odbc.ini file. (pvk) + + * If subsequent SQLExecute returns SQL_ERROR, set handle state back to en_stmt_prepared and leave the prep_state as is. (pvk) + + * Fixed typo in local variable decl (pvk) + +2005-11-07 Patrick van Kleef + + * Added missing file (pvk) + + *** empty log message *** + + * Finalized iODBC-3.52.3 release (pvk) + + * Fixed build issue with previously installed libraries (pvk) + +2005-11-04 Patrick van Kleef + + * Fixed problem building on Mac OS X 64bit (pvk) + + * Apple does not provide certain frameworks in 64bit mode yet (pvk) + + * Added Unicode symbols (pvk) + + * Added option to build in current directory (pvk) + + * Updated DM build number and library version number (pvk) + + * Updated version number to 3.52.3 (pvk) + + * Added check for more wchar functions (pvk) + + * Added support for AIX 5.x (pvk) + + * Removed check for xml2 which is not needed for iODBC (pvk) + + * Added support for HP/UX Itanium (pvk) + + * Fixed support for building on Mac OS X 10.3 and 10.4 in Darwin mode (pvk) + + * Added detection for glibtoolize for Mac OS X build (pvk) + + * Apple does not provide certain frameworks in 64bit mode yet (pvk) + +2005-10-08 Patrick van Kleef + + * Include config.h if present (pvk) + + * Fixed calculating end of buffer without lvalue cast as some compilers did not like this construction (pvk) + + * Ignore files from copied from autoconf/automake/libtool (pvk) + + * Resurrected mkinstalldirs (pvk) + + * Added timestamp to ENTER/EXIT trace lines to get better idea of where application time was spend; inside or outside of ODBC calls. (pvk) + + * Removed files that are distributed by autoconf/automake/libtoolize (pvk) + + * Updated build version and library version (pvk) + + * Fixed problem with truncated messages in ODBC_Error function (pvk) + + * C++ normally has wchar_t (pvk) + + * Fixed problem with symbol hiding unicode translation functions (pvk) + +2005-09-12 Sergey Malinin + + * Avoid calling _iodbcdm_drvconn_dialbox twice (sm) + +2005-09-12 Patrick van Kleef + + * Removed semicolon from end of statement block * Small code cleanup (pvk) + +2005-09-12 Sergey Malinin + + * Set config mode before looking for driver name (sm) + + * Fixed problem with ODBC_BOTH_DSN (sm) + +2005-08-30 Patrick van Kleef + + * Reordered InfoTypes based on ODBC version * Fixed problem with some types like SQL_POS_OPERATION and SQL_POSITIONED_STATEMENTS which where flagged ODBC 2.x only by mistake (pvk) + +2005-08-22 Max Khon + + * Fixed NUL termination problem * DSN input was not disabled correctly (mk) + + * Fixed NUL termination problem (mk) + +2005-08-16 Patrick van Kleef + + * Fixed minor build problems on Mac OS X * Allow both Xcode 1.5 and 2.1 style build directories (pvk) + + * Disable Carbon framework in Mac OS X 64bit port (pvk) + + * Fixed problem mixing framework type header files, which are prefixed with framework name, and internal header files (pvk) + + * Add iodbcinst.h to install target (pvk) + + * Do not distribute iodbc.h header anymore (pvk) + +2005-08-15 Patrick van Kleef + + * Install iodbctest and iodbctestw in /Library/Application Support/iODBC/bin (pvk) + + * Fixed include files for Mac OS X framework build (pvk) + +2005-08-03 Patrick van Kleef + + * Added 'reconnect' command to iodbctest (pvk) + +2005-07-29 Sergey Malinin + + * Added defines for Mac OS X 10.3 and newer (sergei) + + * Fixed typo (sergei) + +2005-07-27 Sergey Malinin + + * Improve the quality of error messages for dynamic linker problems (sergei) + +2005-07-27 Patrick van Kleef + + * Added Max (pvk) + +2005-07-27 Max Khon + + * Recalculate cbConnStrIn as szConnStrIn might have been changed by iodbcdm_drvconn_dialbox (mk) + +2005-07-19 Patrick van Kleef + + * Changed SQL_DRIVER_PROMPT to SQL_DRIVER_COMPLETE which still allows drivers that have graphical setup screens to use them, but fixes a problem with the MyODBC driver which returns a very cryptic "No DSN entered". (pvk) + +2005-07-16 Patrick van Kleef + + * Added initial support for pkg-config spec file (pvk) + + * Fixed problem with SQLDriverConnect when graphical library could not be found, the driver manager automatically returned an error when performing SQLDriverConnect (....., SQL_DRIVER_PROMPT). Instead we now silently continue to call the driver and hope it either asks for the missing connection parameters, or return an error. (pvk) + + * Added support for DSN-less connections (pvk) + +2005-05-13 Patrick van Kleef + + * Renamed iodbcinst.h to odbcinst.h (pvk) + + * Replaced enum bool with int (pvk) + + * Use getprogname on Mac OS X 10.3 and above (pvk) + + * Fixed frameworkname for iODBCinst (pvk) + + * Added support for sqlucode.h (pvk) + +2005-05-12 Patrick van Kleef + + * Renamed iodbcinst.h to odbcinst.h (pvk) + + * Renamed iodbcinst.h to odbcinst.h (pvk) + +2005-03-22 Patrick van Kleef + + * Added missing unicode.[ch] into project file (pvk) + +2005-03-14 Sergey Malinin + + * Added Unicode functions to gtk graphical code * Fixed small Unicode bugs (sm) + +2005-03-09 Patrick van Kleef + + * Removed space from -D compile flag (pvk) + +2005-03-03 Patrick van Kleef + + * Stubs for gtk code until we can fix the Unicode part (pvk) + +2005-03-02 Sergey Malinin + + * Build iODBCadm as a bundle rather than a Framework * Fixed problems calling drvproxy code from iodbcadm (sm) + + * Added support for missing wchar functions (ep+sm) + +2005-03-02 Patrick van Kleef + + * Indented code to improve readability (pvk) + +2005-03-02 Sergey Malinin + + * Added support for iodbcinst Unicode functions (ep+sm) + +2005-03-02 Patrick van Kleef + + * Updated debian build files with latest fixes from Christian (pvk) + +2005-03-01 Patrick van Kleef + + * Ignore config.nice (pvk) + + * Explain which layouts are available instead of cryptic error (pvk) + + * Added extra configure flag --disable-libodbc to disable the building of the additional libodbc.so library some programs are linked against (pvk) + +2005-02-15 Patrick van Kleef + + * Fixed problem compiling iodbctest.c with C++ compiler (pvk) + +2005-02-14 Patrick van Kleef + + * Added initial support for building on MAC OS X 10.4 (pvk) + + * Don't stop the build process if strip fails on Darwin (pvk) + +2005-02-14 Sergey Malinin + + * Fixed symbol clash between Oracle instant client and iODBC on Mac OS X (sergei) + +2005-02-08 Patrick van Kleef + + * Removed static declaration from Done_iODBC (pvk) + +2005-02-04 Patrick van Kleef + + *** empty log message *** + + * Finalized 3.52.2 release (pvk) + + * Put in final release stamp (pvk) + + * Added Mac OS X specific iodbc-config script for framework link (pvk) + +2005-02-01 Patrick van Kleef + + * Ignore build directories (pvk) + + * Updated version number to 3.52.2 (pvk) + + * Added Port.OpenLink script to package distribution (pvk) + + * Fixed iODBC initialization code * Added global lock around SQLAllocHandleSTD (SQL_HANDLE_HENV) (pvk) + + * Close tracefile after the last environment handle has been freed (pvk) + + * Make sure trace_stop can be called multiple times (pvk) + + * Fixed iODBC initialization code * Added global lock around SQLAllocEnv/SQLAllocHandle (SQL_HANDLE_HENV) (pvk) + + * Do not stop tracing prematurely (pvk) + +2005-01-31 Patrick van Kleef + + * Fixed whitespace (pvk) + + * Allow root to trace odbc sessions, but make sure we do not overwrite any existing files (pvk) + + * Changed parsing of TraceFile to avoid buffer overruns (pvk) + + * Added Driver Manager version to start of trace * Added date/time finished to end of trace * Changed date/time format (pvk) + +2005-01-21 Patrick van Kleef + + * Build sample programs with static iODBC libraries (pvk) + + * Removed generated file (pvk) + + * Added script OpenLink uses to port iODBC as reference (pvk) + + * Added bootstrap.sh in package distribution * Added admin/gtk.m4 so target machines without GTK can still use bootstrap.sh to setup the automake/autoconf configuration (pvk) + +2004-12-15 Patrick van Kleef + + * When a driver specific SQLSetConnectAttr fails return SQL_SUCCESS_WITH_INFO rather than failing the connection (pvk) + + * Only Darwin needs this special build rule (pvk) + + * Only call SQLGetDiagRec on allocated handles (pvk) + + * Fixed C++ prototype problems with older code on 32bit (pvk) + + * Use $DESTDIR/$libdir to make libodbc symlinks (pvk) + +2004-11-03 Patrick van Kleef + + * Fixed argument check to be case insensitive (pvk) + +2004-10-23 Patrick van Kleef + + * Fixed null pointer problem (pvk) + +2004-10-15 Patrick van Kleef + + * Use returned size of buffer if possible instead of relying on SQL_NTS (pvk) + +2004-10-04 Patrick van Kleef + + * Added DESTDIR in make install for packaging in different dir (pvk) + +2004-09-29 Patrick van Kleef + + *** empty log message *** + + * Updated NEWS with highlights of new release * Added tag iODBC-3_52_1 to mark final release (pvk) + +2004-09-29 Emmanuel Poitier + + * Fixed Mac OS X install problems (ep) + +2004-09-29 Patrick van Kleef + + * Fixed RPM build/package issue on RedHat 9 (pvk) + + *** empty log message *** + + * Keep deprecated SQLROWCOUNT,SQLROWSETSIZE,SQLTRANSID and SQLROWOFFSET types around for backward compatibility (pvk) + +2004-09-28 Patrick van Kleef + + * Added missing files for Mac OS X build (pvk) + + * Set project version to 3.52.1 (pvk) + + * Added support for SQL_BINARY fields (pvk) + + * Use SQL_DRIVER_PROMPT to call GUI setup if available (pvk) + + * Final fixes for SQLLEN definition (pvk) + + * Fixed problem with ODBCINT64 definition (pvk) + + * Make sure SQLGUID structure is the same size on both 32 and 64bit platforms (pvk) + + * Moved some typedefs around (pvk) + + * Small fixes to align with ms header file (pvk) + + * Explain prototype choice SQLColAttribute (pvk) + + * Mask out old and unused windows types (pvk) + + * Added compile time check for sizeof(long) (pvk) + + * Added symbolic tracing for SQLColAttribute (pvk) + + * Indentation + standard copyright header (pvk) + +2004-09-10 Patrick van Kleef + + * Added new layer so drivers can be logically unloaded without being physically unloaded. This is needed to resolve an outstanding memory leak, while protecting the application from crashing if the unloaded driver registered an on_exit hook. A new flag UnloadSafe can be added to a driver to note it is safe to physically unload the driver. (pvk) + +2004-08-26 Patrick van Kleef + + * Fixed SQLSetDescRec trace function (pvk) + + * Fixed "statement not reached" warning (pvk) + + * Converted SQLUINTEGER to SQLULEN for 64bit handling (pvk) + +2004-08-20 Patrick van Kleef + + * Fixed build issue on non Mac OS X machines (pvk) + +2004-08-20 Emmanuel Poitier + + * Fix to build non-framework version of iODBC on Mac OS X (ep) + +2004-08-16 Patrick van Kleef + + * Enhanced support for tracing SQLGetFunctions (pvk) + +2004-08-13 Patrick van Kleef + + * Increased size of output buffer for DSN to 1024 (pvk) + +2004-07-13 Tim Haynes + + * Set basic permissions (th) + +2004-07-13 Emmanuel Poitier + + * Added script to link Framework build into /usr/local/iODBC on Mac OS X * Fixed problem rewriting header files for Framework build (ep) + +2004-07-13 Patrick van Kleef + + * Allow other ini files besides odbc.ini and odbcinst.ini to support FileDSN functions (pvk) + + * Added standard headers to get some basic typedefs like wchar_t * Added C calling conventions for C++ (pvk) + + * Replaces wchar.h with stdlib.h (pvk) + +2004-07-13 Emmanuel Poitier + + * Small fixes for Mac OS X build (ep) + +2004-07-07 Patrick van Kleef + + * Do not assume . is in PATH when reading the libiodbc.la file (pvk) + + * Make sure we use shl_open on HP/UX (pvk) + + * Removed INT64 and UINT64 types as they clash on various Unix versions (pvk) + +2004-07-06 Patrick van Kleef + + * Added support for iodbcunix.h and iodbcext.h headers (pvk) + + * Fixed 64bit cast problems (pvk) + + * Fixed prototypes (pvk) + + * Use ssize_t and size_t for string lengths * Fixed 64bit cast issues (pvk) + + * Fixed 64bit cast problems (pvk) + + * Initial support for ODBC 3.52 API SQLLEN (pvk) + + * Initialize SQLGetPrivateProfileString return buffer to empty string (pvk) + + * Perform assignment in two steps for some older compilers (pvk) + + * Use _mandir macro for path to man pages (pvk) + + * Enhanced method for detecting pthread support on various platforms (pvk) + + * Use AC_HELP_STRING to format --help texts (pvk) + + * Handle UTF-8 sequences of 5 and 6 bytes * Skip bad UTF-8 sequences replacing them with a # in the trace (pvk) + +2004-07-05 Patrick van Kleef + + * Fixed typo in HP/UX shared library name handling (pvk) + +2004-06-24 Emmanuel Poitier + + * Added project build file for iodbctestw (ep) + + * Small fixes for Mac OS X build (ep) + +2004-06-22 Patrick van Kleef + + * Small indentation fixes (pvk) + + * Fixed compiler warnings * Small indentation fixes (pvk) + + * Removed unused functions * Small indentation cleanups (pvk) + +2004-06-21 Patrick van Kleef + + * Fixed C and C++ compiler warnings * Small indentation fixes (pvk) + + * Preparations for adding ODBC64 support (pvk) + +2004-06-19 Patrick van Kleef + + * Removed obsolete FAR keyword (pvk) + + * Simplified version number maintenance (pvk) + + * Added initial man pages (pvk) + +2004-06-18 Patrick van Kleef + + * Fixed problems in SQLSetScrollOption emulation when driver does not support this function (pvk) + + * Added checks to make sure all stages succeed properly (pvk) + + * Added extra tool needed to compile sample directory (pvk) + + * Export Unicode and ANSI names of ODBC functions (pvk) + + * Install sample source and Makefile in binary distributions (pvk) + + * Added Unicode support * Added extra datatypes (pvk) + +2004-05-13 Patrick van Kleef + + * Added iodbcext.h (pvk) + +2004-05-13 Sergey Malinin + + * Added support for SQLGetEnvAttr(SQL_ATTR_WCHAR_SIZE) extension (sm) + +2004-04-20 Patrick van Kleef + + * Fixed NULL pointer dereference when connection fails (pvk) + +2004-03-18 Emmanuel Poitier + + * Removed dependency on Carbon libraries for now so the driver manager works on non console sessions (ep) + +2004-03-15 Patrick van Kleef + + * Increased input buffer to 4096 (pvk) + +2004-02-24 Patrick van Kleef + + *** empty log message *** + + * Updated NEWS with highlights of new release * Updated version and build numbers to 3.51.2 (pvk) + +2004-02-24 Tim Haynes + + * Fixed build problem on panther (th) + +2004-02-23 Patrick van Kleef + + * Fixed build problem with older make programs (pvk) + + * Fixed problem building on FreeBSD * Clean symbolic links (pvk) + + * Regenerated ChangeLog (pvk) + + * Remove config.nice when making distributions (pvk) + + * Updated version information in preparation of final release (pvk) + + * Added --include-deps * Print comment on using --enable-maintainer-mode (pvk) + +2004-02-23 Tim Haynes + + * Fixed problem building iodbctest program on Mac OS X (th) + + * Removed Framework build (th) + + * Check for pbxbuild (jaguar) or xcodebuild (panther) (th) + +2004-02-23 Patrick van Kleef + + * Updated copyright string (pvk) + + * Added support for config.nice script (pvk) + + * Removed debug code (pvk) + + * Automatically regenerate libiodb.spec script when configure.in changes (pvk) + +2004-02-20 Patrick van Kleef + + * Added --with-layout to simplify installation layouts for different distributions like Debian, Gentoo, FreeBSD etc (pvk) + + * Added missing file in distcheck (pvk) + + * Small documentation enhancements and clarifications (pvk) + + * Renewed build utilities (pvk) + + * Fixed license explaination * Fixed URL to source code on www.iodbc.org site (pvk) + +2004-02-19 Patrick van Kleef + + * Fixed problem with finding install_libodbc.sh shell script (pvk) + + * If the allocation of the statement handle in the drivermanager fails, also release the statement handle in the driver (pvk) + + * Fixed prototype problem on Linux (pvk) + +2004-02-18 Patrick van Kleef + + * Fixed typo in fprintf format (pvk) + + * Initialise native_error to 0 as some drivers do not set this field (pvk) + +2004-02-18 Emmanuel Poitier + + * Increased size of local variables to accommodate larger input * Added SQLRowCount to display number of affected rows on DDL/DML statements (ep) + + * Removed compiler warning (ep) + + * Initialise some local variables (ep) + + * Added missing prototype (ep) + + * Updated Mac OS X build project (ep) + +2004-02-18 Patrick van Kleef + + * Added support for displaying NativeError number * Added support for SQLDiagRec when compiling for ODBC 3.x (pvk) + + * Fixed problem with SQLCloseCursor * Replaced call to SQLFreeStmt (hstmt, SQL_CLOSE) with SQLCloseCursor when compiling for ODBC 3.x (pvk) + + * Removed call to SQLSetConnectOption(SQL_OPT_TRACEFILE) (pvk) + + * SQLCloseCursor should not return SQLState 24000 as this is up to the Driver not the DriverManager (pvk) + +2004-02-17 Patrick van Kleef + + * Fixed compiler warnings * Fixed size calculation for variable length string and binary fields (pvk) + + * Fixed small compiler warnings * Use snprintf when available to guard against buffer overruns * Fixed problem with empty strings (pvk) + + * Added missing trace function for SQLSetDescRec (pvk) + + * Removed stale message handler (pvk) + + * Added support for asprintf and snprintf to guard against buffer overflows (pvk) + + * Create symbolic links for libodbc.a and libodbc.so for applications that need it (pvk) + + * Added support for snprintf (pvk) + + * Increased size of buf to fix potential stack overwrite (pvk) + + * Removed duplicate call to MEM_FREE (pvk) + + * Changed command line arguments for cvs2cl (pvk) + + * Added Tim (pvk) + +2004-02-17 Tim Haynes + + * Small text clarifications (th) + +2004-02-17 Patrick van Kleef + + * Added check for asnprintf and snprintf (pvk) + + * Added tracing to SQLSetDescRec (pvk) + +2003-09-08 Patrick van Kleef + + * Added README.CVS to documentation (pvk) + + * Merged previous Changelogs into NEWS file * Use cvs2cl script to generate Changelog information from CVS (pvk) + + * Updated version and build numbers to 3.51.1 (pvk) + + * Added basic instructions for using the CVS tree (pvk) + + * Renamed bootstrap to bootstrap.sh and made it more developer friendly (pvk) + +2003-09-07 Patrick van Kleef + + * Upgraded to libtool-1.4.3 (pvk) + + * Updated package information and version/build strings (pvk) + + * Rewrote check for Dl_info type (pvk) + + * Removed symbol clash on iodbc_version between various components (pvk) + + * Removed symbol clash on iodbc_version between various components (pvk) + + * Added check for OS dependent compilers and flags for building threaded programs (pvk) + + * Display version number of Driver Manager (pvk) + + * Removed symbol clash on iodbc_version between various components * Simplified getting version information from various components for iodbcadm-gtk (pvk) + + * Added check for const handling (pvk) + +2003-09-05 Patrick van Kleef + + * Added check for FreeBSD wchar_t define (pvk) + + * Do not use -static on convenience libraries (pvk) + +2003-09-04 Patrick van Kleef + + * Moved iodbc/iodbc.h to include/iodbc.h (pvk) + +2003-09-04 Emmanuel Poitier + + * Updated build instructions for MyODBC on Mac OS X (ep) + +2003-09-04 Patrick van Kleef + + * Use instead of (pvk) + + * Moved iodbc/iodbc.h to include/iodbc.h (pvk) + +2003-09-03 Emmanuel Poitier + + * Small fixes for MAC OS X (ep) + +2003-09-03 Patrick van Kleef + + * Added check for OS dependent libraries (pvk) + +2003-09-03 Emmanuel Poitier + + * Small cleanups for MAC OS X build (ep) + +2003-09-03 Patrick van Kleef + + * Small changes to fix problems indicated by gcc compiler warnings (pvk) + + * Fixed buffer size allocation using SQLGetPrivateProfileString * Always use a char buffer for SQLGetPrivateProfileString (pvk) + + * Use correct trace functions (pvk) + +2003-09-02 Patrick van Kleef + + * Added checks for wchar.h and wcslen, wcscpy and wcsncpy and provide our own implementation if they do not exist in the standard C library (pvk) + +2003-08-29 Patrick van Kleef + + * Fixed dependency problem between iodbc and iodbcinst (pvk) + + * Fixed state transition for SQLExecDirect (pvk) + + * Fixed state transitions for SQLFetch/SQLMoreresults (pvk) + + * Added libiodbcinst.la to the library dependency list (pvk) + + * Compile iodbcinst before iodbc (pvk) + + * Removed libiodbcinst.la as this is already implicit from libiodbc.la (pvk) + + * Added $(LIBADD_DL) to --static-libs (pvk) + +2003-08-22 Patrick van Kleef + + * Added info for new release (pvk) + + * Updated version number to 3.51.00 to indicate start of new development cycle (pvk) + + * Merged iODBC-3_0_6-DEVEL tree onto main trunk (pvk) + +2002-04-29 Patrick van Kleef + + * Added instructions on how to build MyODBC using the Mac OS X frameworks (pvk) + + * Wrote final entries for V3.0.6 release (pvk) + +2002-04-29 Patrick van Kleef + + * Install iODBC frameworks always in /Library/Frameworks (pvk) + + * Fixed problems with iODBC header files when building with Mac OS X + frameworks (pvk) + +2002-04-29 Patrick van Kleef + + * Added relative search path for iODBC framework (pvk) + +2002-04-29 Christian Hammers + + * Added packaging rules for the Debian project (ch) + +2002-04-26 Emmanuel Poitier + + * Changed includes to for framework builds (ep) + +2002-04-26 Patrick van Kleef + + * Added define in config.h for building GUI extentions (pvk) + +2002-04-26 Emmanuel Poitier + + * Added initial build environment for Mac OS X framework (ep) + + * Use /Library/Preferences instead of the old /System/Library/Preferences (ep) + + * When using Apple Frameworks we need to provide the framework name (ep) + + * Cleaned some unused variables (ep) + + * If we are not compiling with GUI enabled, make sure we do not have any GUI references in our library (ep) + + * Cleaned some unused variables (ep) + +2002-04-26 Emmanuel Poitier + + * Set default version if the package has not been configured (ep) + + * Add default path for MacOS X preferences (ep) + +2002-04-25 Patrick van Kleef + + * Fixed GTK detection to enable GUI components * Fixed warnings from latest autoconf * Added check for DL_info datatype * Updated library version number to 3:6:1 (pvk) + + * Install the odbctest program with the rest of the package (pvk) + +2002-04-25 Emmanuel Poitier + + * Create a new TOPLEVEL window if the user did not provide a valid window handle (ep) + +2002-04-25 Patrick van Kleef + + * Fixed detection of Dl_info structure (pvk) + + * Makefile cleanups (pvk) + + * Ignore the autom4te.cache dir (pvk) + + * Updated RedHat RPM spec file to latest release (pvk) + + * Upgraded to automake 1.6.1 (pvk) + + * Only build .tar.gz and .zip distributions for now (pvk) + +2002-03-14 Patrick van Kleef + + * Added support for automake 1.6, autoconf 2.53 and libtool 1.4.2 (pvk) + + * Updated comment to reflect dual LGPL/BSD license (pvk) + + * Updated comment to reflect dual LGPL/BSD license (pvk) + + * Added include of iodbc.h (pvk) + + * Fixed multiple definitions of CFLAGS in generated Makefile (pvk) + +2002-01-31 Emmanuel Poitier + + * Added support for mapping SQLError to either SQLGetDiagRec or SQLError in the driver (epoitier) + +2001-10-08 Patrick van Kleef + + * Print the version information of the connected driver * Renamed functions from DB_xxxx to ODBC_xxxx (pvk) + +2001-09-11 Patrick van Kleef + + * Updated version number to 3.0.6 (pvk) + + * Wrote entries for V3.0.6 (pvk) + + * Fixed wrong argument to SQLEndTran call (pvk) + + * Fixed spelling errors (pvk) + + * Added state transitions to SQLFetchScroll (pvk) + + * Fixed typo in mapping SQL_COLUMN_NAME, SQL_COLUMN_NULLABLE, or SQL_COLUMN_COUNT in SQLColumnAttributes (pvk) + + * Fixed bug in cleanup code for descriptors * Fixed getting correct descriptor from driver + + * Return immediately if the arguments to SQLSetPos are wrong (pvk) + + * Added better support for skipping comments in string (pvk) + + * Added support for Driver specific connect options (pvk) + +2001-06-12 Patrick van Kleef + + * Finalized notes for 3.0.5 release (pvk) + + * SQLMoreResults always returned SQL_NO_DATA_FOUND (pvk) + +2001-06-11 Patrick van Kleef + + * Added new package libiodbc-admin (pvk) + + * Added support for multiple result sets (pvk) + + * Added configure flag --enable-gui to switch building the GUI parts of the iODBC administrator (pvk) + + * iODBC is now released under either the GNU Library General Public License or the BSD License. See files COPYING, COPYING.LGPL and COPYING.BSD for details (pvk) + + * Fixed portability issue with dladdr function (pvk) + + * Check if setenv function exists in standard libraries, otherwise use an internal copy (pvk) + + * Fixed typo (pvk) + + * Added sample odbcinst.ini file (pvk) + +2001-06-07 Patrick van Kleef + + * Wrote entries for V3.0.5 (pvk) + + * More files to ignore (pvk) + + * Added new iodbcinst, iodbcadm, drvproxy directories (pvk) + + * Added new contributor (pvk) + +2001-06-07 Emmanuel Poitier + + * Added new iodbcinst library (ep) + +2001-06-07 Patrick van Kleef + + * Added modified BSD license file (pvk) + +2001-06-07 Emmanuel Poitier + + * Added GUI frontend (ep) + + * Added new iodbcadm library and iodbcadm-gtk frontend (ep) + +2001-06-06 Emmanuel Poitier + + * Rewrote SQLDriverConnect(..., SQL_DRIVER_PROMPT) to use GUI where appropriate (ep) + + * Added version and libname symbols (ep) + + * Fixed compiler warning on older compilers (ep) + + * Added dlopen support for Macintosh, Beos and MACX (ep) + + * Added support for Macintosh, Beos and MACX (ep) + +2001-06-04 Patrick van Kleef + + * Only top Makefile.am needs AUTOMAKE_OPTIONS setting (pvk) + + * Added notes (pvk) + + * More files to ignore (pvk) + + * Add -f to gzip (pvk) + + * More files to ignore (pvk) + + * Some files to ignore (pvk) + +2001-06-04 Patrick van Kleef + + * Added new config.h (generated from configure.in) (pvk) + + * Linux RPM spec file now automatically contains proper version number (pvk) + + * Set version number to 3.0.4 (pvk) + +2001-06-04 Patrick van Kleef + + * Added new config.h (generated from configure.in) (pvk) + + * The libiodbc.spec file was moved to the admin directory (pvk) + + * Updated version number to 3.0.4 (pvk) + + * Renamed config.h to iodbc.h (pvk) + +2001-06-04 Patrick van Kleef + + * Renamed config.h to iodbc.h (pvk) + + * Added new config.h (generated from configure.in) (pvk) + +2001-06-04 Patrick van Kleef + + * Linux RPM spec file now automatically contains proper version number (pvk) + + * Major archive restructuring in preparation of adding iodbcinst code (pvk) + + * Major archive restructuring in preparation of adding iodbcinst code (pvk) + + * Major archive restructuring in preparation of adding iodbcinst code (pvk) + + * Major archive restructuring in preparation of adding iodbcinst code (pvk) + +2001-06-01 Patrick van Kleef + + * Added support for automake 1.4-p2, autoconf 2.50 and libtool 1.4 (pvk) + + * Fixed problem with shl_unload on HP/UX (pvk) + + * iODBC does not need a handle to itself on HP/UX (pvk) + +2001-06-01 Patrick van Kleef + + * Added usage information when called with -? (pvk) + + * Added more datatypes (pvk) + +2001-06-01 Patrick van Kleef + + * Rewrote DYLD support for MacOS X/Darwin 1.2 (pvk) + + * Disallow root to start a debug session as this is a security risk (pvk) + + * Added checks for ODBC 3.x date, time and timestamp defines (pvk) + + * Return Driver Type name instead of DSN Description (pvk) + + * Removed stub for SQLGetPrivateProfileString (pvk) + +2000-07-05 Patrick van Kleef + + * Translation of SQL_OJ_CAPABILITIES should only be done in ODBC 3.x (todd) + + * Fixed typo (pvk) + +2000-06-14 Patrick van Kleef + + * Fixed initialization of cip flag which resulted in function sequence errors (pvk) + + * Added call to SQLCloseCursor for ODBC 3.x (pvk) + +2000-02-01 Patrick van Kleef + + * Wrote ChangeLog entries for V3.0.1 and V3.0.2 distribution (pvk) + + * Incremented package version number to 3.0.2 (pvk) + + * SQLNumResult calls is also called from within iODBC, so it needs a wrapper function (pvk) + + * Check the pointer instead of the content (pvk) + +2000-01-28 Patrick van Kleef + + * Added extra check for ANSI C Compilers (pvk) + + * Forgot to update pcbDSN and pcbDesc fields (pvk) + + * Incremented package version number to 3.0.1 (pvk) + + * Incremented package version number to 3.0.1 (pvk) + + * Added new argument --libtool-libs (pvk) + + * Added check for pthread library (pvk) + + * Added new header file for thread-safe codebase (pvk) + + * Added thread-safe macros to the codebase (pvk) + + * Added thread-safe macros and definitions (pvk) + +2000-01-26 Patrick van Kleef + + * Use $(MAKE) instead of plain make command (pvk) + +2000-01-21 Patrick van Kleef + + * Ignore generated files (pvk) + + * Removed generated files in favor of the bootstrap script (pvk) + + * Added shell script for freshly checked out CVS tree (pvk) + +1999-12-16 Patrick van Kleef + + * Refreshed generated files (pvk) + + * Wrote ChangeLog entries for V3.0.0 distribution (pvk) + + * Start using some of the ODBC 3.x API calls (pvk) + + * Notify a ODBC 2.x driver when the internal rowset size changes (pvk) + + * Added support for SQLCloseCursor (pvk) + + * Added backward compatibility for SQL_OJ_CAPABILITIES call to ODBC 2.x driver (pvk) + + * Updated RPM specification file to reflect the new build (pvk) + +1999-12-16 Patrick van Kleef + + * Set library version for ODBC 3.x interface to 3:0:1 (pvk) + + * Set library version for ODBC 2.x interface to 2:51:0 (pvk) + +1999-12-15 Patrick van Kleef + + * Added initial support for MacOS X aka Rhapsody (pvk) + + * Added initial support for MacOS X aka Rhapsody (pvk) + +1999-12-13 Patrick van Kleef + + * Only use the [ODBC Data Sources] section to populate the SQLDataSources call + + * Simplified mapping of API calls to function pointers or text (pvk) + + * Removed unneeded defines (pvk) + +1999-12-10 Patrick van Kleef + + * Ignore iodbc-config generated script (pvk) + + * Refreshed generated files (pvk) + + * Added config script to get information about the installed version of iODBC. (pvk) + + * Set default directory for system wide odbc.ini to /etc (pvk) + + * Rewrote checks for dlopen checking (pvk) + +1999-12-09 Patrick van Kleef + + * Removed spurious #endif (pvk) + +1999-12-09 George Kodinov + + * Added initial ODBC 3.x support (gk) + + * Added initial ODBC 3.x support (gk) + +1999-12-09 Patrick van Kleef + + * Changed to ODBC 3.x mode (pvk) + + * Regenerated files (pvk) + + * Added new contributor (pvk) + + * Regenerated files (pvk) + + * Reran libtoolize version 1.3.4 (pvk) + +1999-12-09 Patrick van Kleef + + * Added maintainer mode (pvk) + + * Added support for ODBC 2.x and ODBC 3.x (pvk) + +1999-12-09 Patrick van Kleef + + * Rewrote header files to support ODBC 3.5 specification (pvk) + +1999-06-25 Patrick van Kleef + + * Added latest changes to the log + + * Changed typedef for SQLHENV, SQLHDBC, SQLSTMT to be void * instead of SQLINTEGER. Although this is contra to the official header files, it makes life a lot easier when you have ODBC 2.0 code you want to use + + * Added latest changes to the log + + * Updated README to reflect the current state of the project (pvk) + +1999-06-25 Patrick van Kleef + + * Added sql.h, sqlext.h, sqltypes.h to the list of installable headers (pvk) + + * Set AutoReqProv flag to yes to allow rpm to automatically calculate + dependancies (pvk) + +1999-06-25 Patrick van Kleef + + * Regenerated file (pvk) + + * Fixed check for default SYS_ODBC_INI when configure --prefix=/xxx is used (pvk) + + * Regenerated (pvk) + + * Added sql.h, sqlext.h and sqltypes.h to the list of installable include files (pvk) + + * Use sql.h and sqlext.h instead of the nonstandard names isql.h and isqlext.h (pvk) + + * Renamed isql.h, isqlext.h and isqltypes.h to sql.h sqlext.h and sqtypes.h and added dummy files for backward compatibility (pvk) + + * Return SQL_SUCCESS on setting SQL_OPT_TRACEFILE (pvk) + + * Removed empty line as this causes confusion to some linkers (pvk) + + * Added target for binary tar distribution (pvk) + +1999-04-26 Patrick van Kleef + + * Simplify building RPMS files on Linux (pvk) + + * Removed CVS Id tag from header so Makefile.am and the generated Makefile.in can be committed together rather than separate (pvk) + + * Search for odbc.ini in various places (pvk) + + * Set default system wide odbc.ini to /etc/odbc.ini if not configured otherwise (pvk) + + * Checked in generated files (pvk) + + * Figure out location for system wide odbc.ini (pvk) + +1999-04-24 Patrick van Kleef + + * Checked in generated files (pvk) + + * Use -I$(top_srcdir) to find the include files (pvk) + + * Added source directory path to export file iodbc.exp (pvk) + + * Checked in generated file (pvk) + + * Added main.c to the list of files to be distributed. (pvk) + + * Checked in generated file (pvk) + + * Added iodbc.exp file which contains the symbol list of all symbols we want to export using libtool. (pvk) + +1999-04-24 Patrick van Kleef + + * Added isqltypes.h (pvk) + + * Updated library version to 2.0.50 (pvk) + +1999-04-24 Patrick van Kleef + + * Added Windows link file for iodbc.dll (pvk) + + * Include isqltypes.h as a global include rather than a local include file (pvk) + + * Small code cleanups (pvk) + +1999-04-24 Patrick van Kleef + + * Code cleanups (pvk) + + * Fixed errors in Windows macros (pvk) + +1999-04-24 Patrick van Kleef + + * Checked in new generated files (pvk) + +1999-04-24 Patrick van Kleef + + * Updated version number of package to 2.50.2 (pvk) + + * Updated version number of library to 2:50:0 (pvk) + +1999-04-24 Patrick van Kleef + + * Updated to more recent version of libtool 1.2f (pvk) + + * Code cleanups (pvk) + + * Added rudementary SQLGetPrivateProfileString call (pvk) + + * Close open file handle (pvk) + + * Use the internal form of the handle instead of the external representation (pvk) + + * Fixed some typo's (pvk) + + * Use the libtool define to check for underscore representation (pvk) + + * Added NEAR definition and HWND type for UNIX/VMS (pvk) + +1999-03-22 Patrick van Kleef + + * Fixed a couple of typos (pvk) + +1999-03-17 Patrick van Kleef + + * Added missing arguments to prototype (pvk) + + * Added support for SQL_DATE, SQL_TIME and SQL_TIMESTAMP (pvk) + +1999-03-17 Per Schroder + + * Added support for VMS (ps) + +1999-03-17 Patrick van Kleef + + * Added Per Schroder who contributed the VMS patches to the iODBC project + +1999-03-17 Per Schroder + + * Added support for VMS (ps) + + * Added support for VMS (ps) + +1999-03-17 Patrick van Kleef + + * Wrote new handle validation checks to make the driver manager more resistant to handle misuse (pvk) + + * Rewrote all function prototypes to conform to ODBC 2.51 standard (pvk) + + * Rewrote all function prototypes to conform to ODBC 2.51 standard (pvk) + + * Added file isqltypes.h (pvk) + + * Rewrote all function prototypes to conform to ODBC 2.51 standard (pvk) + +1999-03-16 Patrick van Kleef + + * Added handle type definitions (pvk) + + * Added new file with ODBC 2.51 types (pvk) + + * Added full support for ODBC 2.51 specifications (pvk) + +1999-01-25 Patrick van Kleef + + * Removed 2 copyright sccs stamps and comments as requested by Ke Jin (pvk) + +1999-01-19 Patrick van Kleef + + * Prefix should of cause be / instead of /usr if we want to install /etc/odbc.ini + + * Added support for automake 1.4, autoconf 2.13 and libtool 1.2a + + * Added sample odbc.ini file + + * Changed reading of tokens from .ini file. We should really rewrite all of these functions. + + * Added specification file for Linux RPM builds + + * Use NEED_USCORE to set _SQL if needed + + * Removed as automake/autoconf/libtool can do this portable + + * Added to comply to GNU standards + + * Set default options + + * Added unwanted files + + * Version number is now set to 2.50 + + * Moved Changes.log into ChangeLog to comply with GNU standards + + * Added new files to comply with standard GNU source packages + + * Added missing typedefs, constants and prototypes + + * Moves HWND typedef to isql.h + + * Added proper support for SQLDataSources * SQLDrivers now returns SQL_NO_MORE_DATA so applications will not go into infinite loops when trying to retrieve driver information + + * Removed hwnd argument from SQLBrowseConnect as this is not part of the API + + * Added sample directory framework + + * Removed as libtool does this automatically + +1999-01-18 Patrick van Kleef + + * Moved iODBC licensing to LGPL as per Ke Jin's request + + * Removed old build code + + * Added information on LGPL licensing + + * Re-indented code * Code cleanups * Added LGPL notice in all opening comments + +1998-12-27 Patrick van Kleef + + * Added new comment to beginning of file * Reindented code + + * Checkin of initial version from Ke Jin + + * Checkin of initial version from Ke Jin diff --git a/LICENSE b/LICENSE index 9b8b78ea..0c52994c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ iODBC Driver Manager Copyright (C) 1995 by Ke Jin -Copyright (C) 1996-2016 by OpenLink Software +Copyright (C) 1996-2019 by OpenLink Software All Rights Reserved. This software is released under either the GNU Library General Public diff --git a/LICENSE.BSD b/LICENSE.BSD index e99a859f..8c7f2bdd 100644 --- a/LICENSE.BSD +++ b/LICENSE.BSD @@ -1,6 +1,6 @@ iODBC Driver Manager Copyright (C) 1995 by Ke Jin -Copyright (C) 1996-2016 by OpenLink Software +Copyright (C) 1996-2019 by OpenLink Software All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Makefile.am b/Makefile.am index 28027cbf..5d0662f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ # The iODBC driver manager. # # Copyright (C) 1995 by Ke Jin -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/NEWS b/NEWS index 970b8dcf..31d063db 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,20 @@ -Jul 12 2015, V3.52.12: +Jul 23 2019, V3.52.13: + * Added extra validation for SQLAllocHandle (SQL_HANDLE_DESC, ...) + * Added GCC __attribute__ for checking format string + * Added missing define SQL_CONVERT_GUID + * Fixed issue using heap after free in SQLConnect_internal + * Fixed issue with global mutex in SQLError, SQLGetDiagRec and SQLGetDiagField + * Fixed SQLSetStmtAttr to cache the correct values for SQL_ATTR_ROW_ARRAY_SIZE and SQL_ATTR_ROW_BIND_TYPE + * Fixed format specifiers and some casts to fix trace output + * Fixed missing check for section in SQLGetPrivateProfileString + * Fixed non-void function needs to return a value + * Fixed issue in Mac Cocoa code + * Fixed iODBC apps/frameworks CFBundleGetInfoString attribute + * Fixes an issue where build fails on Alpine + * Fixed package versioning + * Fixed small memory leaks + +Jul 12 2016, V3.52.12: * Added new Cocoa based dialogs for Mac OS X which will allow 64bit applications to use the standard Login and Setup dialogs from the iODBCinst framework * Added 64bit version of the iODBC Administrator to configure and test DSNs on drivers that are diff --git a/PORT.OpenLink b/PORT.OpenLink index 6bfde451..8dc18f9e 100755 --- a/PORT.OpenLink +++ b/PORT.OpenLink @@ -6,7 +6,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/README b/README index 3e2414cf..320994cc 100644 --- a/README +++ b/README @@ -4,13 +4,13 @@ iODBC Driver Manager Copyright (C) 1995 by Ke Jin - Copyright (C) 1996-2016 by OpenLink Software + Copyright (C) 1996-2019 by OpenLink Software All Rights Reserved. License -Copyright 1996-2016 OpenLink_Software +Copyright 1996-2019 OpenLink_Software This software is released under either the GNU Library General Public License (see LICENSE.LGPL) or the BSD License (see LICENSE.BSD). Note: The only valid version of the GPL license as far as this project is diff --git a/README.md b/README.md index 8cff317d..f9b646d2 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # iODBC Driver Manager Copyright (C) 1995 by Ke Jin - Copyright (C) 1996-2016 by OpenLink Software + Copyright (C) 1996-2019 by OpenLink Software All Rights Reserved. ## License -Copyright 1996-2016 [OpenLink Software](http://www.openlinksw.com) +Copyright 1996-2019 [OpenLink Software](http://www.openlinksw.com) This software is released under either the GNU Library General Public License (see [LICENSE.LGPL](http://github.com/openlink/iODBC/blob/develop/LICENSE.LGPL)) or the BSD License diff --git a/README_GIT b/README_GIT index 81c023c3..459b2b1a 100644 --- a/README_GIT +++ b/README_GIT @@ -3,7 +3,7 @@ Using the iODBC GIT Tree - Copyright (C) 1996-2016 OpenLink Software + Copyright (C) 1996-2019 OpenLink Software Introduction diff --git a/README_GIT.md b/README_GIT.md index 20686d3b..aca836fc 100644 --- a/README_GIT.md +++ b/README_GIT.md @@ -1,6 +1,6 @@ # Using the iODBC GIT Tree - Copyright (C) 1996-2016 OpenLink Software + Copyright (C) 1996-2019 OpenLink Software ## Introduction diff --git a/README_MACOSX b/README_MACOSX index df05ccd6..fe46fa05 100644 --- a/README_MACOSX +++ b/README_MACOSX @@ -3,7 +3,7 @@ How to build iODBC for Mac OS X - Copyright (C) 1996-2016 by OpenLink Software + Copyright (C) 1996-2019 by OpenLink Software Method 1: Using Project builder diff --git a/README_MACOSX.md b/README_MACOSX.md index 971344ac..c60a56a9 100644 --- a/README_MACOSX.md +++ b/README_MACOSX.md @@ -1,6 +1,6 @@ # How to build iODBC for Mac OS X - Copyright (C) 1996-2016 by OpenLink Software + Copyright (C) 1996-2019 by OpenLink Software ## Method 1: Using Project builder You first need to install the latest Mac OS X Developer Packages, which can be found at: diff --git a/acinclude.m4 b/acinclude.m4 index 0ab691a4..e0fb7d3f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4,7 +4,7 @@ # The iODBC driver manager. # # Copyright (C) 1995 by Ke Jin -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/admin/Makefile.am b/admin/Makefile.am index 840b5854..5365f455 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following @@ -71,10 +71,11 @@ # EXTRA_DIST = \ - $(srcdir)/gtk.m4 \ $(srcdir)/gtk-2.0.m4 \ + $(srcdir)/gtk.m4 \ + $(srcdir)/libiodbc.pc.in \ $(srcdir)/libiodbc.spec.in \ - $(srcdir)/libiodbc.pc.in + $(srcdir)/openlink.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libiodbc.pc diff --git a/admin/libiodbc.pc.in b/admin/libiodbc.pc.in index ec464001..e93f6534 100644 --- a/admin/libiodbc.pc.in +++ b/admin/libiodbc.pc.in @@ -7,7 +7,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/admin/libiodbc.spec.in b/admin/libiodbc.spec.in index 6da34b1b..762ba8cd 100644 --- a/admin/libiodbc.spec.in +++ b/admin/libiodbc.spec.in @@ -7,7 +7,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/admin/openlink.m4 b/admin/openlink.m4 new file mode 100644 index 00000000..3fd23510 --- /dev/null +++ b/admin/openlink.m4 @@ -0,0 +1,38 @@ +# +# Autoconf macros used by OpenLink +# + +AC_DEFUN([OPL_CONFIG_NICE], [ + rm -f $1 + cat >$1 <<-CONFIG_NICE_EOF + #!$SHELL + # + # Created by configure for $PACKAGE_STRING + # + +CONFIG_NICE_EOF + + export_names="export" + for var in SHELL CFLAGS CXXFLAGS CPPFLAGS LDFLAGS INCLUDES LIBS CC CXX + do + eval val=\$$var + if test -n "$val"; then + echo "$var='$val'" >> $1 + export_names="$export_names $var" + fi + done + + echo "$export_names" >> $1 + + echo "" >> $1 + echo "# configure" >> $1 + + eval "set -- $ac_configure_args" + echo "[$]SHELL \"[$]0\" \\" >> $1 + for arg + do + echo "'$arg' \\" >> $1 + done + echo '"[$]@"' >> $1 + chmod +x $1 +])dnl diff --git a/autogen.sh b/autogen.sh index 15ff21c0..bc288948 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,7 +7,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/bin/Makefile.am b/bin/Makefile.am index e9150647..761aea55 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/bin/iodbc-config.in b/bin/iodbc-config.in index 08d46ae8..0b3cc2f5 100644 --- a/bin/iodbc-config.in +++ b/bin/iodbc-config.in @@ -2,7 +2,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following @@ -79,7 +79,7 @@ usage() cat < Usage: diff --git a/configure.ac b/configure.ac index b8771f35..fff57dcf 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_REVISION($Id$) # The iODBC driver manager. # # Copyright (C) 1995 by Ke Jin -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following @@ -74,6 +74,19 @@ AC_REVISION($Id$) # +########################################################################## +## ## +## Version info ## +## ## +########################################################################## +m4_define(V_iodbc_major, [3]) # ODBC Major version +m4_define(V_iodbc_minor, [52]) # ODBC Minor version +m4_define(V_iodbc_patch, [13]) # Increase every release +m4_define(V_iodbc_devel, []) # -dev, -rc1 or empty for stable + +m4_define(V_iodbc_date, [190723]) # YYMMDD of release +m4_define(V_iodbc_shlib, [27]) # Increase every change + ########################################################################## ## ## @@ -81,14 +94,14 @@ AC_REVISION($Id$) ## ## ########################################################################## AC_INIT([iODBC Driver Manager], - [3.52.12], + V_iodbc_major.V_iodbc_minor.V_iodbc_patch[]V_iodbc_devel, [iodbc@openlinksw.com], [libiodbc]) AC_CONFIG_SRCDIR([include/isql.h]) AC_CONFIG_AUX_DIR(admin) AC_CONFIG_MACRO_DIR(admin) AC_CONFIG_HEADERS(include/config.h) -AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION) +AM_INIT_AUTOMAKE AC_CANONICAL_HOST AM_MAINTAINER_MODE @@ -102,14 +115,14 @@ AM_MAINTAINER_MODE # # Version information for SQLGetInfo(SQL_DM_VER) call # -BUILD_MAJOR="12" # last digit of version number -BUILD_MINOR="160712" # year/month/day of release +BUILD_MAJOR="V_iodbc_patch" # last digit of version number +BUILD_MINOR="V_iodbc_date" # year/month/day of release BUILD_VER="${BUILD_MAJOR}${BUILD_MINOR}" # # Library version numbers # -lib3_version=3:25:1 # ODBC 3.x mode +lib3_version=3:V_iodbc_shlib:1 # ODBC 3.x mode lib2_version=2:55:0 # ODBC 2.x mode (do not change) @@ -137,22 +150,8 @@ fi ## Save configuration for later reuse ## ## ## ########################################################################## -echo creating config.nice -rm -f config.nice -cat >config.nice<> config.nice -for arg in $ac_configure_args -do - echo "$arg \\" >> config.nice -done -echo '"$@"' >> config.nice -chmod +x config.nice +OPL_CONFIG_NICE([config.nice]) ########################################################################## @@ -249,7 +248,6 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CC_STDC AC_PROG_CPP -AM_PROG_AR AC_LANG([C]) AC_C_CONST @@ -262,7 +260,6 @@ AC_C_CONST AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -dnl AC_PROG_RANLIB AC_PROG_LIBTOOL dnl LT_INIT(dlopen) diff --git a/debian/copyright b/debian/copyright index 3726f7ba..e6ed46aa 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,7 +12,7 @@ Copyright: # The iODBC driver manager. # # Copyright (C) 1995 by Ke Jin -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/drvproxy/ConfigDSN.c b/drvproxy/ConfigDSN.c index 263599ba..37d0c9a6 100644 --- a/drvproxy/ConfigDSN.c +++ b/drvproxy/ConfigDSN.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -252,23 +252,20 @@ ConfigDSN ( if (connstr == (LPSTR) - 1L) goto done; - /* Compare if the DSN changed */ - if (strcmp (connstr + STRLEN ("DSN="), dsn)) - { - /* Remove the previous DSN */ - SQLSetConfigMode (confMode); - if (!SQLRemoveDSNFromIni (dsn)) - goto done; - /* Add the new DSN section */ - SQLSetConfigMode (confMode); - if (!SQLWriteDSNToIni (dsn = connstr + STRLEN ("DSN="), lpszDriver)) - goto done; - } + + /* Remove the previous DSN */ + SQLSetConfigMode (confMode); + if (!SQLRemoveDSNFromIni (dsn)) + goto done; + + /* Add the new DSN section */ + SQLSetConfigMode (confMode); + if (!SQLWriteDSNToIni (dsn = connstr + STRLEN ("DSN="), lpszDriver)) + goto done; /* Add each keyword and values */ for (curr = connstr; *curr; curr += (STRLEN (curr) + 1)) { - if (strncmp (curr, "DSN=", STRLEN ("DSN="))) { STRCPY (dsnread, curr); diff --git a/drvproxy/ConfigDriver.c b/drvproxy/ConfigDriver.c index 352015e0..cb9e84e1 100644 --- a/drvproxy/ConfigDriver.c +++ b/drvproxy/ConfigDriver.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/Info.c b/drvproxy/Info.c index db8daa04..de4d8380 100644 --- a/drvproxy/Info.c +++ b/drvproxy/Info.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/Makefile.am b/drvproxy/Makefile.am index 9636ed11..a73b787b 100644 --- a/drvproxy/Makefile.am +++ b/drvproxy/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/drvproxy/drvconn.c b/drvproxy/drvconn.c index a215b79c..865f4172 100644 --- a/drvproxy/drvconn.c +++ b/drvproxy/drvconn.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/gtk/Makefile.am b/drvproxy/gtk/Makefile.am index 16cfc238..7daff603 100644 --- a/drvproxy/gtk/Makefile.am +++ b/drvproxy/gtk/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/drvproxy/gtk/gensetup.c b/drvproxy/gtk/gensetup.c index dfe90163..d3378e22 100644 --- a/drvproxy/gtk/gensetup.c +++ b/drvproxy/gtk/gensetup.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/gtk/gui.h b/drvproxy/gtk/gui.h index cacb3147..3401d135 100644 --- a/drvproxy/gtk/gui.h +++ b/drvproxy/gtk/gui.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/gtk/loginbox.c b/drvproxy/gtk/loginbox.c index 4d254528..56aea740 100644 --- a/drvproxy/gtk/loginbox.c +++ b/drvproxy/gtk/loginbox.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/gui.h b/drvproxy/gui.h index acb0b366..58e7671e 100644 --- a/drvproxy/gui.h +++ b/drvproxy/gui.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/login.c b/drvproxy/login.c index 8d1637e7..86fba8cb 100644 --- a/drvproxy/login.c +++ b/drvproxy/login.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/mac/IODBCProxy_LoginController.h b/drvproxy/mac/IODBCProxy_LoginController.h index b0bd8231..36fb8bff 100644 --- a/drvproxy/mac/IODBCProxy_LoginController.h +++ b/drvproxy/mac/IODBCProxy_LoginController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/mac/IODBCProxy_LoginController.m b/drvproxy/mac/IODBCProxy_LoginController.m index de4672c4..70c17b12 100644 --- a/drvproxy/mac/IODBCProxy_LoginController.m +++ b/drvproxy/mac/IODBCProxy_LoginController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/mac/IODBCProxy_SetupController.h b/drvproxy/mac/IODBCProxy_SetupController.h index fbceea4f..89f37c79 100644 --- a/drvproxy/mac/IODBCProxy_SetupController.h +++ b/drvproxy/mac/IODBCProxy_SetupController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/mac/IODBCProxy_SetupController.m b/drvproxy/mac/IODBCProxy_SetupController.m index 8f87837f..70af7024 100644 --- a/drvproxy/mac/IODBCProxy_SetupController.m +++ b/drvproxy/mac/IODBCProxy_SetupController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -230,9 +230,6 @@ - (void)parse_attrs:(const char *)attrs val!=nil?val:@"", @"val", nil]]; } - else{ - [_Attrs_list addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:@"", @"key", @"", @"val", nil]]; - } } } diff --git a/drvproxy/mac/confirm.c b/drvproxy/mac/confirm.c index 3389a200..bf3f496c 100644 --- a/drvproxy/mac/confirm.c +++ b/drvproxy/mac/confirm.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/mac/gensetup.c b/drvproxy/mac/gensetup.c index 42b5fdf5..73910871 100644 --- a/drvproxy/mac/gensetup.c +++ b/drvproxy/mac/gensetup.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/mac/gui.h b/drvproxy/mac/gui.h index 8919db9b..b8c8b884 100644 --- a/drvproxy/mac/gui.h +++ b/drvproxy/mac/gui.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/mac/loginbox.c b/drvproxy/mac/loginbox.c index 0520da67..aeaa7c50 100644 --- a/drvproxy/mac/loginbox.c +++ b/drvproxy/mac/loginbox.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/mac/utils.h b/drvproxy/mac/utils.h index 445f0752..64b0168b 100644 --- a/drvproxy/mac/utils.h +++ b/drvproxy/mac/utils.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/drvproxy/mac/utils.m b/drvproxy/mac/utils.m index b2b667d8..e49bbfc5 100644 --- a/drvproxy/mac/utils.m +++ b/drvproxy/mac/utils.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/etc/Makefile.am b/etc/Makefile.am index f6cfd3e6..f10e1254 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/include/Makefile.am b/include/Makefile.am index 71d3d0c5..9105d6fd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/include/iodbc.h b/include/iodbc.h index 4cb337b6..47b44e88 100644 --- a/include/iodbc.h +++ b/include/iodbc.h @@ -9,7 +9,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -84,13 +84,13 @@ #endif #ifndef VERSION -#define VERSION "3.52.12" +#define VERSION "3.52.13" #define MAJ_VERSION "3" #define MIN_VERSION "52" #endif #ifndef IODBC_BUILD -#define IODBC_BUILD 12160712 /* 0001.0928 */ +#define IODBC_BUILD 13190723 /* 0001.0928 */ #endif #if !defined(WINDOWS) && !defined(WIN32_SYSTEM) diff --git a/include/iodbcext.h b/include/iodbcext.h index 1cfb68bc..b5e747c4 100644 --- a/include/iodbcext.h +++ b/include/iodbcext.h @@ -8,7 +8,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/include/iodbcinst.h b/include/iodbcinst.h index 63c8dce7..794ab3b8 100644 --- a/include/iodbcinst.h +++ b/include/iodbcinst.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/include/iodbcunix.h b/include/iodbcunix.h index 485ca624..4ab84fd4 100644 --- a/include/iodbcunix.h +++ b/include/iodbcunix.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/include/isql.h b/include/isql.h index cb132d30..a67d70ef 100644 --- a/include/isql.h +++ b/include/isql.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/include/isqlext.h b/include/isqlext.h index 5262c925..7ae0f32d 100644 --- a/include/isqlext.h +++ b/include/isqlext.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/include/isqltypes.h b/include/isqltypes.h index f31e34bd..8b7704e1 100644 --- a/include/isqltypes.h +++ b/include/isqltypes.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/include/odbcinst.h b/include/odbcinst.h index 32aa7625..9177da05 100644 --- a/include/odbcinst.h +++ b/include/odbcinst.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/include/sql.h b/include/sql.h index d0af9d5d..2b27d850 100644 --- a/include/sql.h +++ b/include/sql.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/include/sqlext.h b/include/sqlext.h index 3ae5b67b..9a05b533 100644 --- a/include/sqlext.h +++ b/include/sqlext.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -858,6 +858,7 @@ extern "C" { #define SQL_DDL_INDEX 170 #define SQL_DM_VER 171 #define SQL_INSERT_STATEMENT 172 +#define SQL_CONVERT_GUID 173 #define SQL_UNION_STATEMENT SQL_UNION #endif /* ODBCVER >= 0x0300 */ diff --git a/include/sqltypes.h b/include/sqltypes.h index dc0df751..8db2bd9b 100644 --- a/include/sqltypes.h +++ b/include/sqltypes.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -407,7 +407,8 @@ typedef unsigned short SQLWCHAR; defined(_WCHAR_T_DECLARED) || \ defined(_BSD_WCHAR_T_DEFINED_) || \ defined(_BSD_WCHAR_T_) || \ - defined(_BSD_CT_RUNE_T_) + defined(_BSD_CT_RUNE_T_) || \ + defined(__DEFINED_wchar_t) typedef wchar_t SQLWCHAR; # else # error Please make sure your system supports the wchar_t type diff --git a/include/sqlucode.h b/include/sqlucode.h index 8acca707..5bd073a8 100644 --- a/include/sqlucode.h +++ b/include/sqlucode.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/Makefile.am b/iodbc/Makefile.am index 79c8b2c4..345dc301 100644 --- a/iodbc/Makefile.am +++ b/iodbc/Makefile.am @@ -4,7 +4,7 @@ # The iODBC driver manager. # # Copyright (C) 1995 by Ke Jin -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/iodbc/catalog.c b/iodbc/catalog.c index 6b1dbafe..a282c8c7 100644 --- a/iodbc/catalog.c +++ b/iodbc/catalog.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/connect.c b/iodbc/connect.c index b2d9aabf..c6d385d4 100644 --- a/iodbc/connect.c +++ b/iodbc/connect.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -1249,9 +1249,12 @@ _iodbcdm_driverload ( if (sqlstat != en_00000) { _iodbcdm_dllclose (hdll); - MEM_FREE (penv); PUSHSQLERR (pdbc->herr, en_IM004); + /* free internal env */ + MEM_FREE (penv); + pdbc->henv = NULL; + return SQL_ERROR; } @@ -1351,6 +1354,7 @@ _iodbcdm_driverload ( } pdbc->cp_timeout = cp_timeout; + MEM_FREE (pdbc->cp_probe); pdbc->cp_probe = strdup (cp_probe); return SQL_SUCCESS; @@ -1466,7 +1470,9 @@ _iodbcdm_driverunload (HDBC hdbc, int ver) } } + /* free internal env */ MEM_FREE (penv); + pdbc->henv = NULL; } /* pdbc->henv = SQL_NULL_HENV; */ @@ -2053,11 +2059,11 @@ SQLConnect_Internal (SQLHDBC hdbc, RETURN (SQL_ERROR); } + retcode = _iodbcdm_driverload (_dsn, (char *)driver, pdbc, thread_safe, unload_safe, waMode); + MEM_FREE(_szDSN); _szDSN = NULL; - retcode = _iodbcdm_driverload (_dsn, (char *)driver, pdbc, thread_safe, unload_safe, waMode); - switch (retcode) { case SQL_SUCCESS: diff --git a/iodbc/dlproc.c b/iodbc/dlproc.c index d9a3a8c1..39215147 100644 --- a/iodbc/dlproc.c +++ b/iodbc/dlproc.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/dlproc.h b/iodbc/dlproc.h index 65758a7d..54f7b9fb 100644 --- a/iodbc/dlproc.h +++ b/iodbc/dlproc.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/execute.c b/iodbc/execute.c index b615aa74..0ffaa049 100644 --- a/iodbc/execute.c +++ b/iodbc/execute.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/fetch.c b/iodbc/fetch.c index 7018ae22..c3b66f1f 100644 --- a/iodbc/fetch.c +++ b/iodbc/fetch.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/hdbc.c b/iodbc/hdbc.c index 70144fb9..46197a9f 100644 --- a/iodbc/hdbc.c +++ b/iodbc/hdbc.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -294,7 +294,11 @@ SQLFreeConnect_Internal (SQLHDBC hdbc, int ver) /* free driver connect options */ _iodbcdm_drvopt_free (pdbc); - + + /* free probe */ + if (pdbc->cp_probe) + MEM_FREE (pdbc->cp_probe); + /* * Invalidate this handle */ diff --git a/iodbc/hdbc.h b/iodbc/hdbc.h index f61e57be..1cd63c1b 100644 --- a/iodbc/hdbc.h +++ b/iodbc/hdbc.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/hdesc.h b/iodbc/hdesc.h index 1d09823d..e5019eb4 100644 --- a/iodbc/hdesc.h +++ b/iodbc/hdesc.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -135,9 +135,9 @@ typedef struct DESC_s { #define LEAVE_DESC(hdesc, trace) \ ODBC_LOCK (); \ + pdesc->desc_cip = 0; \ done: \ TRACE(trace); \ - pdesc->desc_cip = 0; \ ODBC_UNLOCK (); \ return (retcode) diff --git a/iodbc/henv.c b/iodbc/henv.c index 868997df..5823854c 100644 --- a/iodbc/henv.c +++ b/iodbc/henv.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -278,6 +278,7 @@ Init_iODBC (void) SPINLOCK_INIT (iodbcdm_global_lock); #endif +#if 0 SPINLOCK_LOCK (iodbcdm_global_lock); if (!_iodbcdm_initialized) { @@ -291,6 +292,7 @@ Init_iODBC (void) */ } SPINLOCK_UNLOCK (iodbcdm_global_lock); +#endif return; } diff --git a/iodbc/henv.ci b/iodbc/henv.ci index 94413cbd..b28d9d91 100644 --- a/iodbc/henv.ci +++ b/iodbc/henv.ci @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/henv.h b/iodbc/henv.h index 71777b63..3cdf9405 100644 --- a/iodbc/henv.h +++ b/iodbc/henv.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/herr.c b/iodbc/herr.c index b51e0a03..1f63cab0 100644 --- a/iodbc/herr.c +++ b/iodbc/herr.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -605,35 +605,73 @@ SQLError ( SQLSMALLINT * pcbErrorMsg) { SQLRETURN retcode = SQL_SUCCESS; + GENV (genv, henv); + CONN (pdbc, hdbc); + STMT (pstmt, hstmt); + SQLSMALLINT HandleType; + int holdlock = 0; ODBC_LOCK (); - TRACE (trace_SQLError (TRACE_ENTER, - henv, - hdbc, - hstmt, - szSqlstate, - pfNativeError, - szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); - - retcode = _iodbcdm_sqlerror ( - henv, - hdbc, - hstmt, - szSqlstate, - pfNativeError, - szErrorMsg, cbErrorMsgMax, pcbErrorMsg, - 1, - 'A'); - - TRACE (trace_SQLError (TRACE_LEAVE, - henv, - hdbc, - hstmt, - szSqlstate, - pfNativeError, - szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); + + TRACE (trace_SQLError (TRACE_ENTER, henv, hdbc, hstmt, szSqlstate, pfNativeError, szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); + + if (IS_VALID_HSTMT (pstmt)) + { + HandleType = SQL_HANDLE_STMT; + if (pstmt->stmt_cip) + { + PUSHSQLERR (pstmt->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pstmt->stmt_cip = 1; + } + else if (IS_VALID_HDBC (hdbc)) + { + HandleType = SQL_HANDLE_DBC; + if (pdbc->dbc_cip) + { + PUSHSQLERR (pdbc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdbc->dbc_cip = 1; + } + else if (IS_VALID_HENV (genv)) + { + HandleType = SQL_HANDLE_ENV; + holdlock = 1; + } + else + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + + if (!holdlock) + ODBC_UNLOCK (); + + retcode = _iodbcdm_sqlerror (henv, hdbc, hstmt, szSqlstate, pfNativeError, szErrorMsg, cbErrorMsgMax, pcbErrorMsg, 1, 'A'); + + if (!holdlock) + ODBC_LOCK (); + + switch (HandleType) + { + case SQL_HANDLE_DBC: + pdbc->dbc_cip = 0; + break; + + case SQL_HANDLE_STMT: + pstmt->stmt_cip = 0; + break; + } + +done: + TRACE (trace_SQLError (TRACE_LEAVE, henv, hdbc, hstmt, szSqlstate, pfNativeError, szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); ODBC_UNLOCK (); + return retcode; } @@ -651,35 +689,73 @@ SQLErrorA ( SQLSMALLINT * pcbErrorMsg) { SQLRETURN retcode = SQL_SUCCESS; + GENV (genv, henv); + CONN (pdbc, hdbc); + STMT (pstmt, hstmt); + SQLSMALLINT HandleType; + int holdlock = 0; ODBC_LOCK (); - TRACE (trace_SQLError (TRACE_ENTER, - henv, - hdbc, - hstmt, - szSqlstate, - pfNativeError, - szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); - - retcode = _iodbcdm_sqlerror ( - henv, - hdbc, - hstmt, - szSqlstate, - pfNativeError, - szErrorMsg, cbErrorMsgMax, pcbErrorMsg, - 1, - 'A'); - - TRACE (trace_SQLError (TRACE_LEAVE, - henv, - hdbc, - hstmt, - szSqlstate, - pfNativeError, - szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); + + TRACE (trace_SQLError (TRACE_ENTER, henv, hdbc, hstmt, szSqlstate, pfNativeError, szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); + + if (IS_VALID_HSTMT (pstmt)) + { + HandleType = SQL_HANDLE_STMT; + if (pstmt->stmt_cip) + { + PUSHSQLERR (pstmt->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pstmt->stmt_cip = 1; + } + else if (IS_VALID_HDBC (hdbc)) + { + HandleType = SQL_HANDLE_DBC; + if (pdbc->dbc_cip) + { + PUSHSQLERR (pdbc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdbc->dbc_cip = 1; + } + else if (IS_VALID_HENV (genv)) + { + HandleType = SQL_HANDLE_ENV; + holdlock = 1; + } + else + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + + if (!holdlock) + ODBC_UNLOCK (); + + retcode = _iodbcdm_sqlerror (henv, hdbc, hstmt, szSqlstate, pfNativeError, szErrorMsg, cbErrorMsgMax, pcbErrorMsg, 1, 'A'); + + if (!holdlock) + ODBC_LOCK (); + + switch (HandleType) + { + case SQL_HANDLE_DBC: + pdbc->dbc_cip = 0; + break; + + case SQL_HANDLE_STMT: + pstmt->stmt_cip = 0; + break; + } + +done: + TRACE (trace_SQLError (TRACE_LEAVE, henv, hdbc, hstmt, szSqlstate, pfNativeError, szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); ODBC_UNLOCK (); + return retcode; } @@ -696,35 +772,73 @@ SQLErrorW ( SQLSMALLINT * pcbErrorMsg) { SQLRETURN retcode = SQL_SUCCESS; + GENV (genv, henv); + CONN (pdbc, hdbc); + STMT (pstmt, hstmt); + SQLSMALLINT HandleType; + int holdlock = 0; ODBC_LOCK (); - TRACE (trace_SQLErrorW (TRACE_ENTER, - henv, - hdbc, - hstmt, - szSqlstate, - pfNativeError, - szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); - - retcode = _iodbcdm_sqlerror ( - henv, - hdbc, - hstmt, - szSqlstate, - pfNativeError, - szErrorMsg, cbErrorMsgMax, pcbErrorMsg, - 1, - 'W'); - - TRACE (trace_SQLErrorW (TRACE_LEAVE, - henv, - hdbc, - hstmt, - szSqlstate, - pfNativeError, - szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); + + TRACE (trace_SQLErrorW (TRACE_ENTER, henv, hdbc, hstmt, szSqlstate, pfNativeError, szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); + + if (IS_VALID_HSTMT (pstmt)) + { + HandleType = SQL_HANDLE_STMT; + if (pstmt->stmt_cip) + { + PUSHSQLERR (pstmt->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pstmt->stmt_cip = 1; + } + else if (IS_VALID_HDBC (hdbc)) + { + HandleType = SQL_HANDLE_DBC; + if (pdbc->dbc_cip) + { + PUSHSQLERR (pdbc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdbc->dbc_cip = 1; + } + else if (IS_VALID_HENV (genv)) + { + HandleType = SQL_HANDLE_ENV; + holdlock = 1; + } + else + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + + if (!holdlock) + ODBC_UNLOCK (); + + retcode = _iodbcdm_sqlerror (henv, hdbc, hstmt, szSqlstate, pfNativeError, szErrorMsg, cbErrorMsgMax, pcbErrorMsg, 1, 'W'); + + if (!holdlock) + ODBC_LOCK (); + + switch (HandleType) + { + case SQL_HANDLE_DBC: + pdbc->dbc_cip = 0; + break; + + case SQL_HANDLE_STMT: + pstmt->stmt_cip = 0; + break; + } + +done: + TRACE (trace_SQLErrorW (TRACE_LEAVE, henv, hdbc, hstmt, szSqlstate, pfNativeError, szErrorMsg, cbErrorMsgMax, pcbErrorMsg)); ODBC_UNLOCK (); + return retcode; } #endif @@ -790,38 +904,22 @@ SQLGetDiagRec_Internal ( switch (HandleType) { case SQL_HANDLE_ENV: - if (!IS_VALID_HENV (Handle)) - { - return SQL_INVALID_HANDLE; - } err = ((GENV_t *) Handle)->herr; break; case SQL_HANDLE_DBC: - if (!IS_VALID_HDBC (Handle)) - { - return SQL_INVALID_HANDLE; - } err = ((DBC_t *) Handle)->herr; dhandle = ((DBC_t *) Handle)->dhdbc; hdbc = Handle; break; case SQL_HANDLE_STMT: - if (!IS_VALID_HSTMT (Handle)) - { - return SQL_INVALID_HANDLE; - } err = ((STMT_t *) Handle)->herr; dhandle = ((STMT_t *) Handle)->dhstmt; hdbc = ((STMT_t *) Handle)->hdbc; break; case SQL_HANDLE_DESC: - if (!IS_VALID_HDESC (Handle)) - { - return SQL_INVALID_HANDLE; - } err = ((DESC_t *) Handle)->herr; dhandle = ((DESC_t *) Handle)->dhdesc; hdbc = ((DESC_t *) Handle)->hdbc; @@ -1076,33 +1174,102 @@ SQLGetDiagRec ( SQLSMALLINT * TextLengthPtr) { SQLRETURN retcode = SQL_SUCCESS; + GENV (genv, Handle); + CONN (pdbc, Handle); + STMT (pstmt, Handle); + DESC (pdesc, Handle); + int holdlock = 0; ODBC_LOCK (); - TRACE (trace_SQLGetDiagRec (TRACE_ENTER, - HandleType, - Handle, - RecNumber, - Sqlstate, - NativeErrorPtr, - MessageText, BufferLength, TextLengthPtr)); - - retcode = SQLGetDiagRec_Internal ( - HandleType, - Handle, - RecNumber, - Sqlstate, - NativeErrorPtr, - MessageText, BufferLength, TextLengthPtr, - 'A'); - - TRACE (trace_SQLGetDiagRec (TRACE_LEAVE, - HandleType, - Handle, - RecNumber, - Sqlstate, - NativeErrorPtr, - MessageText, BufferLength, TextLengthPtr)); + TRACE (trace_SQLGetDiagRec (TRACE_ENTER, HandleType, Handle, RecNumber, Sqlstate, NativeErrorPtr, MessageText, BufferLength, TextLengthPtr)); + + switch (HandleType) + { + case SQL_HANDLE_ENV: + if (!IS_VALID_HENV (genv)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + holdlock = 1; + break; + + case SQL_HANDLE_DBC: + if (!IS_VALID_HDBC (pdbc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdbc->dbc_cip) + { + PUSHSQLERR (pdbc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdbc->dbc_cip = 1; + break; + + case SQL_HANDLE_STMT: + if (!IS_VALID_HSTMT (pstmt)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pstmt->stmt_cip) + { + PUSHSQLERR (pstmt->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pstmt->stmt_cip = 1; + break; + + case SQL_HANDLE_DESC: + if (!IS_VALID_HDESC (pdesc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdesc->desc_cip) + { + PUSHSQLERR (pdesc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdesc->desc_cip = 1; + break; + + default: + retcode = SQL_INVALID_HANDLE; + goto done; + } + + if (!holdlock) + ODBC_UNLOCK (); + + retcode = SQLGetDiagRec_Internal (HandleType, Handle, RecNumber, Sqlstate, NativeErrorPtr, MessageText, BufferLength, TextLengthPtr, 'A'); + + if (!holdlock) + ODBC_LOCK (); + + switch (HandleType) + { + case SQL_HANDLE_DBC: + pdbc->dbc_cip = 0; + break; + + case SQL_HANDLE_STMT: + pstmt->stmt_cip = 0; + break; + + case SQL_HANDLE_DESC: + pdesc->desc_cip = 0; + break; + } + +done: + TRACE (trace_SQLGetDiagRec (TRACE_LEAVE, HandleType, Handle, RecNumber, Sqlstate, NativeErrorPtr, MessageText, BufferLength, TextLengthPtr)); ODBC_UNLOCK (); @@ -1122,33 +1289,102 @@ SQLGetDiagRecA ( SQLSMALLINT * TextLengthPtr) { SQLRETURN retcode = SQL_SUCCESS; + GENV (genv, Handle); + CONN (pdbc, Handle); + STMT (pstmt, Handle); + DESC (pdesc, Handle); + int holdlock = 0; ODBC_LOCK (); - TRACE (trace_SQLGetDiagRec (TRACE_ENTER, - HandleType, - Handle, - RecNumber, - Sqlstate, - NativeErrorPtr, - MessageText, BufferLength, TextLengthPtr)); - - retcode = SQLGetDiagRec_Internal ( - HandleType, - Handle, - RecNumber, - Sqlstate, - NativeErrorPtr, - MessageText, BufferLength, TextLengthPtr, - 'A'); - - TRACE (trace_SQLGetDiagRec (TRACE_LEAVE, - HandleType, - Handle, - RecNumber, - Sqlstate, - NativeErrorPtr, - MessageText, BufferLength, TextLengthPtr)); + TRACE (trace_SQLGetDiagRec (TRACE_ENTER, HandleType, Handle, RecNumber, Sqlstate, NativeErrorPtr, MessageText, BufferLength, TextLengthPtr)); + + switch (HandleType) + { + case SQL_HANDLE_ENV: + if (!IS_VALID_HENV (genv)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + holdlock = 1; + break; + + case SQL_HANDLE_DBC: + if (!IS_VALID_HDBC (pdbc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdbc->dbc_cip) + { + PUSHSQLERR (pdbc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdbc->dbc_cip = 1; + break; + + case SQL_HANDLE_STMT: + if (!IS_VALID_HSTMT (pstmt)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pstmt->stmt_cip) + { + PUSHSQLERR (pstmt->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pstmt->stmt_cip = 1; + break; + + case SQL_HANDLE_DESC: + if (!IS_VALID_HDESC (pdesc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdesc->desc_cip) + { + PUSHSQLERR (pdesc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdesc->desc_cip = 1; + break; + + default: + retcode = SQL_INVALID_HANDLE; + goto done; + } + + if (!holdlock) + ODBC_UNLOCK (); + + retcode = SQLGetDiagRec_Internal (HandleType, Handle, RecNumber, Sqlstate, NativeErrorPtr, MessageText, BufferLength, TextLengthPtr, 'A'); + + if (!holdlock) + ODBC_LOCK (); + + switch (HandleType) + { + case SQL_HANDLE_DBC: + pdbc->dbc_cip = 0; + break; + + case SQL_HANDLE_STMT: + pstmt->stmt_cip = 0; + break; + + case SQL_HANDLE_DESC: + pdesc->desc_cip = 0; + break; + } + +done: + TRACE (trace_SQLGetDiagRec (TRACE_LEAVE, HandleType, Handle, RecNumber, Sqlstate, NativeErrorPtr, MessageText, BufferLength, TextLengthPtr)); ODBC_UNLOCK (); @@ -1168,33 +1404,102 @@ SQLGetDiagRecW ( SQLSMALLINT * TextLengthPtr) { SQLRETURN retcode = SQL_SUCCESS; + GENV (genv, Handle); + CONN (pdbc, Handle); + STMT (pstmt, Handle); + DESC (pdesc, Handle); + int holdlock = 0; ODBC_LOCK (); - TRACE (trace_SQLGetDiagRecW (TRACE_ENTER, - HandleType, - Handle, - RecNumber, - Sqlstate, - NativeErrorPtr, - MessageText, BufferLength, TextLengthPtr)); - - retcode = SQLGetDiagRec_Internal ( - HandleType, - Handle, - RecNumber, - Sqlstate, - NativeErrorPtr, - MessageText, BufferLength, TextLengthPtr, - 'W'); - - TRACE (trace_SQLGetDiagRecW (TRACE_LEAVE, - HandleType, - Handle, - RecNumber, - Sqlstate, - NativeErrorPtr, - MessageText, BufferLength, TextLengthPtr)); + TRACE (trace_SQLGetDiagRecW (TRACE_ENTER, HandleType, Handle, RecNumber, Sqlstate, NativeErrorPtr, MessageText, BufferLength, TextLengthPtr)); + + switch (HandleType) + { + case SQL_HANDLE_ENV: + if (!IS_VALID_HENV (genv)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + holdlock = 1; + break; + + case SQL_HANDLE_DBC: + if (!IS_VALID_HDBC (pdbc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdbc->dbc_cip) + { + PUSHSQLERR (pdbc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdbc->dbc_cip = 1; + break; + + case SQL_HANDLE_STMT: + if (!IS_VALID_HSTMT (pstmt)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pstmt->stmt_cip) + { + PUSHSQLERR (pstmt->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pstmt->stmt_cip = 1; + break; + + case SQL_HANDLE_DESC: + if (!IS_VALID_HDESC (pdesc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdesc->desc_cip) + { + PUSHSQLERR (pdesc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdesc->desc_cip = 1; + break; + + default: + retcode = SQL_INVALID_HANDLE; + goto done; + } + + if (!holdlock) + ODBC_UNLOCK (); + + retcode = SQLGetDiagRec_Internal (HandleType, Handle, RecNumber, Sqlstate, NativeErrorPtr, MessageText, BufferLength, TextLengthPtr, 'W'); + + if (!holdlock) + ODBC_LOCK (); + + switch (HandleType) + { + case SQL_HANDLE_DBC: + pdbc->dbc_cip = 0; + break; + + case SQL_HANDLE_STMT: + pstmt->stmt_cip = 0; + break; + + case SQL_HANDLE_DESC: + pdesc->desc_cip = 0; + break; + } + +done: + TRACE (trace_SQLGetDiagRecW (TRACE_LEAVE, HandleType, Handle, RecNumber, Sqlstate, NativeErrorPtr, MessageText, BufferLength, TextLengthPtr)); ODBC_UNLOCK (); @@ -1229,10 +1534,6 @@ SQLGetDiagField_Internal ( switch (nHandleType) { case SQL_HANDLE_ENV: - if (!IS_VALID_HENV (Handle)) - { - return SQL_INVALID_HANDLE; - } err = genv->herr; con = NULL; stmt = NULL; @@ -1240,10 +1541,6 @@ SQLGetDiagField_Internal ( break; case SQL_HANDLE_DBC: - if (!IS_VALID_HDBC (Handle)) - { - return SQL_INVALID_HANDLE; - } err = con->herr; genv = (GENV_t *) con->genv; stmt = NULL; @@ -1252,10 +1549,6 @@ SQLGetDiagField_Internal ( break; case SQL_HANDLE_STMT: - if (!IS_VALID_HSTMT (Handle)) - { - return SQL_INVALID_HANDLE; - } err = stmt->herr; con = (DBC_t *) stmt->hdbc; genv = (GENV_t *) con->genv; @@ -1264,10 +1557,6 @@ SQLGetDiagField_Internal ( break; case SQL_HANDLE_DESC: - if (!IS_VALID_HDESC (Handle)) - { - return SQL_INVALID_HANDLE; - } err = desc->herr; stmt = (STMT_t *) desc->hstmt; con = (DBC_t *) desc->hdbc; @@ -1370,7 +1659,7 @@ SQLGetDiagField_Internal ( { (*(SQLINTEGER *) pDiagInfoPtr) = 0; /* get the number from the driver */ - if (con) + if (con && con->henv != SQL_NULL_HENV) { CALL_UDRIVER(con, Handle, retcode, hproc, unicode_driver, en_GetDiagField, (nHandleType, dhandle, 0, nDiagIdentifier, @@ -1859,30 +2148,102 @@ SQLGetDiagField ( SQLSMALLINT * StringLengthPtr) { SQLRETURN retcode = SQL_SUCCESS; + GENV (genv, Handle); + CONN (pdbc, Handle); + STMT (pstmt, Handle); + DESC (pdesc, Handle); + int holdlock = 0; ODBC_LOCK (); - TRACE (trace_SQLGetDiagField (TRACE_ENTER, - HandleType, - Handle, - RecNumber, - DiagIdentifier, - DiagInfoPtr, BufferLength, StringLengthPtr)); - - retcode = SQLGetDiagField_Internal ( - HandleType, - Handle, - RecNumber, - DiagIdentifier, - DiagInfoPtr, BufferLength, StringLengthPtr, - 'A'); - - TRACE (trace_SQLGetDiagField (TRACE_LEAVE, - HandleType, - Handle, - RecNumber, - DiagIdentifier, - DiagInfoPtr, BufferLength, StringLengthPtr)); + TRACE (trace_SQLGetDiagField (TRACE_ENTER, HandleType, Handle, RecNumber, DiagIdentifier, DiagInfoPtr, BufferLength, StringLengthPtr)); + + switch (HandleType) + { + case SQL_HANDLE_ENV: + if (!IS_VALID_HENV (genv)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + holdlock = 1; + break; + + case SQL_HANDLE_DBC: + if (!IS_VALID_HDBC (pdbc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdbc->dbc_cip) + { + PUSHSQLERR (pdbc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdbc->dbc_cip = 1; + break; + + case SQL_HANDLE_STMT: + if (!IS_VALID_HSTMT (pstmt)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pstmt->stmt_cip) + { + PUSHSQLERR (pstmt->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pstmt->stmt_cip = 1; + break; + + case SQL_HANDLE_DESC: + if (!IS_VALID_HDESC (pdesc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdesc->desc_cip) + { + PUSHSQLERR (pdesc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdesc->desc_cip = 1; + break; + + default: + retcode = SQL_INVALID_HANDLE; + goto done; + } + + if (!holdlock) + ODBC_UNLOCK (); + + retcode = SQLGetDiagField_Internal (HandleType, Handle, RecNumber, DiagIdentifier, DiagInfoPtr, BufferLength, StringLengthPtr, 'A'); + + if (!holdlock) + ODBC_LOCK (); + + switch (HandleType) + { + case SQL_HANDLE_DBC: + pdbc->dbc_cip = 0; + break; + + case SQL_HANDLE_STMT: + pstmt->stmt_cip = 0; + break; + + case SQL_HANDLE_DESC: + pdesc->desc_cip = 0; + break; + } + +done: + TRACE (trace_SQLGetDiagField (TRACE_LEAVE, HandleType, Handle, RecNumber, DiagIdentifier, DiagInfoPtr, BufferLength, StringLengthPtr)); ODBC_UNLOCK (); @@ -1901,30 +2262,102 @@ SQLGetDiagFieldA ( SQLSMALLINT * StringLengthPtr) { SQLRETURN retcode = SQL_SUCCESS; + GENV (genv, Handle); + CONN (pdbc, Handle); + STMT (pstmt, Handle); + DESC (pdesc, Handle); + int holdlock = 0; ODBC_LOCK (); - TRACE (trace_SQLGetDiagField (TRACE_ENTER, - HandleType, - Handle, - RecNumber, - DiagIdentifier, - DiagInfoPtr, BufferLength, StringLengthPtr)); - - retcode = SQLGetDiagField_Internal ( - HandleType, - Handle, - RecNumber, - DiagIdentifier, - DiagInfoPtr, BufferLength, StringLengthPtr, - 'A'); - - TRACE (trace_SQLGetDiagField (TRACE_LEAVE, - HandleType, - Handle, - RecNumber, - DiagIdentifier, - DiagInfoPtr, BufferLength, StringLengthPtr)); + TRACE (trace_SQLGetDiagField (TRACE_ENTER, HandleType, Handle, RecNumber, DiagIdentifier, DiagInfoPtr, BufferLength, StringLengthPtr)); + + switch (HandleType) + { + case SQL_HANDLE_ENV: + if (!IS_VALID_HENV (genv)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + holdlock = 1; + break; + + case SQL_HANDLE_DBC: + if (!IS_VALID_HDBC (pdbc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdbc->dbc_cip) + { + PUSHSQLERR (pdbc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdbc->dbc_cip = 1; + break; + + case SQL_HANDLE_STMT: + if (!IS_VALID_HSTMT (pstmt)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pstmt->stmt_cip) + { + PUSHSQLERR (pstmt->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pstmt->stmt_cip = 1; + break; + + case SQL_HANDLE_DESC: + if (!IS_VALID_HDESC (pdesc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdesc->desc_cip) + { + PUSHSQLERR (pdesc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdesc->desc_cip = 1; + break; + + default: + retcode = SQL_INVALID_HANDLE; + goto done; + } + + if (!holdlock) + ODBC_UNLOCK (); + + retcode = SQLGetDiagField_Internal (HandleType, Handle, RecNumber, DiagIdentifier, DiagInfoPtr, BufferLength, StringLengthPtr, 'A'); + + if (!holdlock) + ODBC_LOCK (); + + switch (HandleType) + { + case SQL_HANDLE_DBC: + pdbc->dbc_cip = 0; + break; + + case SQL_HANDLE_STMT: + pstmt->stmt_cip = 0; + break; + + case SQL_HANDLE_DESC: + pdesc->desc_cip = 0; + break; + } + +done: + TRACE (trace_SQLGetDiagField (TRACE_LEAVE, HandleType, Handle, RecNumber, DiagIdentifier, DiagInfoPtr, BufferLength, StringLengthPtr)); ODBC_UNLOCK (); @@ -1943,30 +2376,102 @@ SQLGetDiagFieldW ( SQLSMALLINT * StringLengthPtr) { SQLRETURN retcode = SQL_SUCCESS; + GENV (genv, Handle); + CONN (pdbc, Handle); + STMT (pstmt, Handle); + DESC (pdesc, Handle); + int holdlock = 0; ODBC_LOCK (); - TRACE (trace_SQLGetDiagFieldW (TRACE_ENTER, - HandleType, - Handle, - RecNumber, - DiagIdentifier, - DiagInfoPtr, BufferLength, StringLengthPtr)); - - retcode = SQLGetDiagField_Internal ( - HandleType, - Handle, - RecNumber, - DiagIdentifier, - DiagInfoPtr, BufferLength, StringLengthPtr, - 'W'); - - TRACE (trace_SQLGetDiagFieldW (TRACE_LEAVE, - HandleType, - Handle, - RecNumber, - DiagIdentifier, - DiagInfoPtr, BufferLength, StringLengthPtr)); + TRACE (trace_SQLGetDiagFieldW (TRACE_ENTER, HandleType, Handle, RecNumber, DiagIdentifier, DiagInfoPtr, BufferLength, StringLengthPtr)); + + switch (HandleType) + { + case SQL_HANDLE_ENV: + if (!IS_VALID_HENV (genv)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + holdlock = 1; + break; + + case SQL_HANDLE_DBC: + if (!IS_VALID_HDBC (pdbc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdbc->dbc_cip) + { + PUSHSQLERR (pdbc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdbc->dbc_cip = 1; + break; + + case SQL_HANDLE_STMT: + if (!IS_VALID_HSTMT (pstmt)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pstmt->stmt_cip) + { + PUSHSQLERR (pstmt->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pstmt->stmt_cip = 1; + break; + + case SQL_HANDLE_DESC: + if (!IS_VALID_HDESC (pdesc)) + { + retcode = SQL_INVALID_HANDLE; + goto done; + } + else if (pdesc->desc_cip) + { + PUSHSQLERR (pdesc->herr, en_S1010); + retcode = SQL_ERROR; + goto done; + } + pdesc->desc_cip = 1; + break; + + default: + retcode = SQL_INVALID_HANDLE; + goto done; + } + + if (!holdlock) + ODBC_UNLOCK (); + + retcode = SQLGetDiagField_Internal (HandleType, Handle, RecNumber, DiagIdentifier, DiagInfoPtr, BufferLength, StringLengthPtr, 'W'); + + if (!holdlock) + ODBC_LOCK (); + + switch (HandleType) + { + case SQL_HANDLE_DBC: + pdbc->dbc_cip = 0; + break; + + case SQL_HANDLE_STMT: + pstmt->stmt_cip = 0; + break; + + case SQL_HANDLE_DESC: + pdesc->desc_cip = 0; + break; + } + +done: + TRACE (trace_SQLGetDiagFieldW (TRACE_LEAVE, HandleType, Handle, RecNumber, DiagIdentifier, DiagInfoPtr, BufferLength, StringLengthPtr)); ODBC_UNLOCK (); diff --git a/iodbc/herr.ci b/iodbc/herr.ci index d5adc0aa..71624c73 100644 --- a/iodbc/herr.ci +++ b/iodbc/herr.ci @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/herr.h b/iodbc/herr.h index b0b07882..a5530acc 100644 --- a/iodbc/herr.h +++ b/iodbc/herr.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/hstmt.c b/iodbc/hstmt.c index 446da96d..9f19dff7 100644 --- a/iodbc/hstmt.c +++ b/iodbc/hstmt.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/hstmt.h b/iodbc/hstmt.h index b9573563..1ee5667e 100644 --- a/iodbc/hstmt.h +++ b/iodbc/hstmt.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/info.c b/iodbc/info.c index abea8ff9..bbd43c79 100644 --- a/iodbc/info.c +++ b/iodbc/info.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/install_libodbc.sh b/iodbc/install_libodbc.sh index c82d5cfe..715d3adb 100755 --- a/iodbc/install_libodbc.sh +++ b/iodbc/install_libodbc.sh @@ -7,7 +7,7 @@ # The iODBC driver manager. # # Copyright (C) 1995 by Ke Jin -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/iodbc/iodbc.def b/iodbc/iodbc.def index bf3bda0b..71bbecfd 100644 --- a/iodbc/iodbc.def +++ b/iodbc/iodbc.def @@ -8,7 +8,7 @@ ; The iODBC driver manager. ; ; Copyright (C) 1995 by Ke Jin -; Copyright (C) 1996-2016 by OpenLink Software +; Copyright (C) 1996-2019 by OpenLink Software ; All Rights Reserved. ; ; This software is released under the terms of either of the following diff --git a/iodbc/iodbc_misc.h b/iodbc/iodbc_misc.h index 31ffe81f..4eff3faf 100644 --- a/iodbc/iodbc_misc.h +++ b/iodbc/iodbc_misc.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/ithread.h b/iodbc/ithread.h index 93139859..65e1d113 100644 --- a/iodbc/ithread.h +++ b/iodbc/ithread.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/itrace.h b/iodbc/itrace.h index 7b33ad37..de323619 100644 --- a/iodbc/itrace.h +++ b/iodbc/itrace.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/main.c b/iodbc/main.c index 0912742d..37469bc4 100644 --- a/iodbc/main.c +++ b/iodbc/main.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/misc.c b/iodbc/misc.c index 33cdfe5f..50149d87 100644 --- a/iodbc/misc.c +++ b/iodbc/misc.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/odbc3.c b/iodbc/odbc3.c index 26ae6eef..acc7786b 100644 --- a/iodbc/odbc3.c +++ b/iodbc/odbc3.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -114,6 +114,88 @@ SQLRETURN SQLAllocStmt_Internal (SQLHDBC hdbc, SQLHSTMT * phstmt); SQLRETURN SQLFreeStmt_Internal (SQLHSTMT hstmt, SQLUSMALLINT fOption); SQLRETURN SQLTransact_Internal (SQLHENV henv, SQLHDBC hdbc, SQLUSMALLINT fType); +SQLRETURN +SQLAllocDesc_Internal ( + SQLHDBC hdbc, + SQLHDESC * phdesc) +{ + CONN (pdbc, hdbc); + SQLRETURN retcode = SQL_SUCCESS; + HPROC hproc = SQL_NULL_HPROC; + DESC_t *new_desc; + SQLUINTEGER odbc_ver; + SQLUINTEGER dodbc_ver; + + /* check state */ + switch (pdbc->state) + { + case en_dbc_connected: + case en_dbc_hstmt: + break; + + case en_dbc_allocated: + case en_dbc_needdata: + PUSHSQLERR (pdbc->herr, en_08003); + *phdesc = SQL_NULL_HSTMT; + + return SQL_ERROR; + + default: + return SQL_INVALID_HANDLE; + } + + odbc_ver = ((GENV_t *) pdbc->genv)->odbc_ver; + dodbc_ver = (pdbc->henv != SQL_NULL_HENV) ? ((ENV_t *) pdbc->henv)->dodbc_ver : odbc_ver; + + if (odbc_ver == SQL_OV_ODBC2 || dodbc_ver == SQL_OV_ODBC2) + { + PUSHSQLERR (pdbc->herr, en_HYC00); + return SQL_ERROR; + } + + if (phdesc == NULL) + { + PUSHSQLERR (pdbc->herr, en_HY009); + return SQL_ERROR; + } + + hproc = _iodbcdm_getproc (pdbc, en_AllocHandle); + + if (hproc == SQL_NULL_HPROC) + { + PUSHSQLERR (pdbc->herr, en_IM001); + return SQL_ERROR; + } + + new_desc = (DESC_t *) MEM_ALLOC (sizeof (DESC_t)); + if (!new_desc) + { + PUSHSQLERR (pdbc->herr, en_HY001); + return SQL_ERROR; + } + memset (new_desc, 0, sizeof (DESC_t)); + CALL_DRIVER (pdbc, pdbc, retcode, hproc, (SQL_HANDLE_DESC, pdbc->dhdbc, &new_desc->dhdesc)); + + if (!SQL_SUCCEEDED (retcode)) + { + MEM_FREE (new_desc); + return SQL_ERROR; + } + + new_desc->type = SQL_HANDLE_DESC; + new_desc->hdbc = pdbc; + new_desc->hstmt = NULL; + new_desc->herr = NULL; + new_desc->desc_cip = 0; + *phdesc = new_desc; + + new_desc->next = (DESC_t *) pdbc->hdesc; + pdbc->hdesc = new_desc; + + return SQL_SUCCESS; +} + + RETCODE SQL_API SQLAllocHandle_Internal ( SQLSMALLINT handleType, @@ -159,9 +241,6 @@ SQLAllocHandle_Internal ( case SQL_HANDLE_DESC: { CONN (con, inputHandle); - HPROC hproc = SQL_NULL_HPROC; - RETCODE retcode; - DESC_t *new_desc; if (!IS_VALID_HDBC (con)) { @@ -169,52 +248,7 @@ SQLAllocHandle_Internal ( } CLEAR_ERRORS (con); - if (((ENV_t *)(con->henv))->dodbc_ver == SQL_OV_ODBC2) - { - PUSHSQLERR (con->herr, en_HYC00); - return SQL_ERROR; - } - if (!outputHandlePtr) - { - PUSHSQLERR (con->herr, en_HY009); - return SQL_ERROR; - } - - hproc = _iodbcdm_getproc (con, en_AllocHandle); - - if (hproc == SQL_NULL_HPROC) - { - PUSHSQLERR (con->herr, en_IM001); - return SQL_ERROR; - } - - new_desc = (DESC_t *) MEM_ALLOC (sizeof (DESC_t)); - if (!new_desc) - { - PUSHSQLERR (con->herr, en_HY001); - return SQL_ERROR; - } - memset (new_desc, 0, sizeof (DESC_t)); - CALL_DRIVER (con, con, retcode, hproc, - (handleType, con->dhdbc, &new_desc->dhdesc)); - - if (!SQL_SUCCEEDED (retcode)) - { - MEM_FREE (new_desc); - return SQL_ERROR; - } - - new_desc->type = SQL_HANDLE_DESC; - new_desc->hdbc = con; - new_desc->hstmt = NULL; - new_desc->herr = NULL; - new_desc->desc_cip = 0; - *outputHandlePtr = new_desc; - - new_desc->next = (DESC_t *) con->hdesc; - con->hdesc = new_desc; - - return SQL_SUCCESS; + return SQLAllocDesc_Internal (inputHandle, outputHandlePtr); } default: @@ -1452,7 +1486,7 @@ SQLSetStmtAttr_Internal ( if (SQL_SUCCEEDED (retcode)) { - stmt->rowset_size = Attribute; + stmt->rowset_size = (SQLUINTEGER) (SQLULEN) ValuePtr; if (retcode == SQL_SUCCESS_WITH_INFO) { SQLUINTEGER data; @@ -1497,7 +1531,7 @@ SQLSetStmtAttr_Internal ( if (SQL_SUCCEEDED (retcode)) { - stmt->rowset_size = Attribute;; + stmt->rowset_size = (SQLUINTEGER) (SQLULEN) ValuePtr; if (retcode == SQL_SUCCESS_WITH_INFO) { SQLUINTEGER data; @@ -1517,7 +1551,7 @@ SQLSetStmtAttr_Internal ( if (SQL_SUCCEEDED (retcode)) { - stmt->rowset_size = Attribute;; + stmt->rowset_size = (SQLUINTEGER) (SQLULEN) ValuePtr; if (retcode == SQL_SUCCESS_WITH_INFO) { SQLUINTEGER data; @@ -1591,7 +1625,7 @@ SQLSetStmtAttr_Internal ( } if (Attribute == SQL_ATTR_ROW_BIND_TYPE && SQL_SUCCEEDED (retcode)) - stmt->bind_type = Attribute; + stmt->bind_type = (SQLUINTEGER) (SQLULEN) ValuePtr; return retcode; } @@ -1603,7 +1637,7 @@ SQLSetStmtAttr_Internal ( CALL_DRIVER (stmt->hdbc, stmt, retcode, hproc, (stmt->dhstmt, Attribute, ValuePtr)); if (Attribute == SQL_ATTR_ROW_BIND_TYPE && SQL_SUCCEEDED (retcode)) - stmt->bind_type = Attribute; + stmt->bind_type = (SQLUINTEGER) (SQLULEN) ValuePtr; return retcode; } else @@ -1613,7 +1647,7 @@ SQLSetStmtAttr_Internal ( CALL_DRIVER (stmt->hdbc, stmt, retcode, hproc, (stmt->dhstmt, Attribute, ValuePtr)); if (Attribute == SQL_ATTR_ROW_BIND_TYPE && SQL_SUCCEEDED (retcode)) - stmt->bind_type = Attribute; + stmt->bind_type = (SQLUINTEGER) (SQLULEN) ValuePtr; return retcode; } else diff --git a/iodbc/prepare.c b/iodbc/prepare.c index 7efa6142..aee18003 100644 --- a/iodbc/prepare.c +++ b/iodbc/prepare.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/result.c b/iodbc/result.c index b5f1c070..e88c40cb 100644 --- a/iodbc/result.c +++ b/iodbc/result.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/AllocConnect.c b/iodbc/trace/AllocConnect.c index ae4035cf..0e9d2a0d 100644 --- a/iodbc/trace/AllocConnect.c +++ b/iodbc/trace/AllocConnect.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/AllocEnv.c b/iodbc/trace/AllocEnv.c index 86825d12..0d0ea074 100644 --- a/iodbc/trace/AllocEnv.c +++ b/iodbc/trace/AllocEnv.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/AllocHandle.c b/iodbc/trace/AllocHandle.c index 1322267b..08353f39 100644 --- a/iodbc/trace/AllocHandle.c +++ b/iodbc/trace/AllocHandle.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/AllocStmt.c b/iodbc/trace/AllocStmt.c index 66ceebe2..13c14d01 100644 --- a/iodbc/trace/AllocStmt.c +++ b/iodbc/trace/AllocStmt.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/BindCol.c b/iodbc/trace/BindCol.c index e0c360f3..c09592b3 100644 --- a/iodbc/trace/BindCol.c +++ b/iodbc/trace/BindCol.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/BindParameter.c b/iodbc/trace/BindParameter.c index c6acedcf..42e814bf 100644 --- a/iodbc/trace/BindParameter.c +++ b/iodbc/trace/BindParameter.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/BrowseConnect.c b/iodbc/trace/BrowseConnect.c index 45ddfaed..8131447d 100644 --- a/iodbc/trace/BrowseConnect.c +++ b/iodbc/trace/BrowseConnect.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/BulkOperations.c b/iodbc/trace/BulkOperations.c index e25e1985..ddc4910e 100644 --- a/iodbc/trace/BulkOperations.c +++ b/iodbc/trace/BulkOperations.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Cancel.c b/iodbc/trace/Cancel.c index 3159c391..fbf36895 100644 --- a/iodbc/trace/Cancel.c +++ b/iodbc/trace/Cancel.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/CloseCursor.c b/iodbc/trace/CloseCursor.c index a19140da..66bb6bfa 100644 --- a/iodbc/trace/CloseCursor.c +++ b/iodbc/trace/CloseCursor.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/ColAttribute.c b/iodbc/trace/ColAttribute.c index e4267b5a..9ce9edd5 100644 --- a/iodbc/trace/ColAttribute.c +++ b/iodbc/trace/ColAttribute.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -105,7 +105,7 @@ _trace_colattr2_type (SQLUSMALLINT type) _S (SQL_COLUMN_LABEL); } - trace_emit ("\t\t%-15.15s %ld (%s)\n", "SQLUSMALLINT ", (int) type, ptr); + trace_emit ("\t\t%-15.15s %d (%s)\n", "SQLUSMALLINT ", (int) type, ptr); } diff --git a/iodbc/trace/ColumnPrivileges.c b/iodbc/trace/ColumnPrivileges.c index 78214f99..db6977b6 100644 --- a/iodbc/trace/ColumnPrivileges.c +++ b/iodbc/trace/ColumnPrivileges.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Columns.c b/iodbc/trace/Columns.c index c4a8a409..1a2ea3cd 100644 --- a/iodbc/trace/Columns.c +++ b/iodbc/trace/Columns.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Connect.c b/iodbc/trace/Connect.c index 32cf4c0a..36377c66 100644 --- a/iodbc/trace/Connect.c +++ b/iodbc/trace/Connect.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/CopyDesc.c b/iodbc/trace/CopyDesc.c index c937eff9..871ff8cc 100644 --- a/iodbc/trace/CopyDesc.c +++ b/iodbc/trace/CopyDesc.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/DataSources.c b/iodbc/trace/DataSources.c index 683403f4..ce6edfcb 100644 --- a/iodbc/trace/DataSources.c +++ b/iodbc/trace/DataSources.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/DescribeCol.c b/iodbc/trace/DescribeCol.c index bfd24a9c..1cbe5ff3 100644 --- a/iodbc/trace/DescribeCol.c +++ b/iodbc/trace/DescribeCol.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/DescribeParam.c b/iodbc/trace/DescribeParam.c index 35d30833..19afe68c 100644 --- a/iodbc/trace/DescribeParam.c +++ b/iodbc/trace/DescribeParam.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Disconnect.c b/iodbc/trace/Disconnect.c index 3ceac7c5..932723c8 100644 --- a/iodbc/trace/Disconnect.c +++ b/iodbc/trace/Disconnect.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/DriverConnect.c b/iodbc/trace/DriverConnect.c index 2b30818d..53436990 100644 --- a/iodbc/trace/DriverConnect.c +++ b/iodbc/trace/DriverConnect.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Drivers.c b/iodbc/trace/Drivers.c index cc9f1069..fdb79c97 100644 --- a/iodbc/trace/Drivers.c +++ b/iodbc/trace/Drivers.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/EndTran.c b/iodbc/trace/EndTran.c index 46197b27..65ddef1e 100644 --- a/iodbc/trace/EndTran.c +++ b/iodbc/trace/EndTran.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Error.c b/iodbc/trace/Error.c index 45cbc479..72ee686d 100644 --- a/iodbc/trace/Error.c +++ b/iodbc/trace/Error.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/ExecDirect.c b/iodbc/trace/ExecDirect.c index a5d94592..f4de4524 100644 --- a/iodbc/trace/ExecDirect.c +++ b/iodbc/trace/ExecDirect.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Execute.c b/iodbc/trace/Execute.c index bee86f52..395ea740 100644 --- a/iodbc/trace/Execute.c +++ b/iodbc/trace/Execute.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/ExtendedFetch.c b/iodbc/trace/ExtendedFetch.c index fce55b44..6b276318 100644 --- a/iodbc/trace/ExtendedFetch.c +++ b/iodbc/trace/ExtendedFetch.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Fetch.c b/iodbc/trace/Fetch.c index e7673ffe..ab37fea5 100644 --- a/iodbc/trace/Fetch.c +++ b/iodbc/trace/Fetch.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/FetchScroll.c b/iodbc/trace/FetchScroll.c index e6a9c139..84231a41 100644 --- a/iodbc/trace/FetchScroll.c +++ b/iodbc/trace/FetchScroll.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/ForeignKeys.c b/iodbc/trace/ForeignKeys.c index 5f0813ef..a72bbf00 100644 --- a/iodbc/trace/ForeignKeys.c +++ b/iodbc/trace/ForeignKeys.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/FreeConnect.c b/iodbc/trace/FreeConnect.c index ff2b3521..b2330f8e 100644 --- a/iodbc/trace/FreeConnect.c +++ b/iodbc/trace/FreeConnect.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/FreeEnv.c b/iodbc/trace/FreeEnv.c index bad3d35d..e69863c7 100644 --- a/iodbc/trace/FreeEnv.c +++ b/iodbc/trace/FreeEnv.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/FreeHandle.c b/iodbc/trace/FreeHandle.c index 0856d536..4430345d 100644 --- a/iodbc/trace/FreeHandle.c +++ b/iodbc/trace/FreeHandle.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/FreeStmt.c b/iodbc/trace/FreeStmt.c index 117e329d..1ba9ecb4 100644 --- a/iodbc/trace/FreeStmt.c +++ b/iodbc/trace/FreeStmt.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetConnectAttr.c b/iodbc/trace/GetConnectAttr.c index 6cff01a9..7ead17c7 100644 --- a/iodbc/trace/GetConnectAttr.c +++ b/iodbc/trace/GetConnectAttr.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetConnectOption.c b/iodbc/trace/GetConnectOption.c index 5e8930af..c51ce302 100644 --- a/iodbc/trace/GetConnectOption.c +++ b/iodbc/trace/GetConnectOption.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -113,7 +113,7 @@ _trace_connopt_type (SQLUSMALLINT type) _S (SQL_USE_BOOKMARKS); } - trace_emit ("\t\t%-15.15s %ld (%s)\n", "SQLUSMALLINT ", (int) type, ptr); + trace_emit ("\t\t%-15.15s %d (%s)\n", "SQLUSMALLINT ", (int) type, ptr); } diff --git a/iodbc/trace/GetCursorName.c b/iodbc/trace/GetCursorName.c index 5324cb28..cf07ea50 100644 --- a/iodbc/trace/GetCursorName.c +++ b/iodbc/trace/GetCursorName.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetData.c b/iodbc/trace/GetData.c index 3f023051..dcdef8be 100644 --- a/iodbc/trace/GetData.c +++ b/iodbc/trace/GetData.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetDescField.c b/iodbc/trace/GetDescField.c index 14a91c0d..03bf78c4 100644 --- a/iodbc/trace/GetDescField.c +++ b/iodbc/trace/GetDescField.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetDescRec.c b/iodbc/trace/GetDescRec.c index dbc3d481..6bd8f314 100644 --- a/iodbc/trace/GetDescRec.c +++ b/iodbc/trace/GetDescRec.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetDiagField.c b/iodbc/trace/GetDiagField.c index 0f16aa0b..977e9bfe 100644 --- a/iodbc/trace/GetDiagField.c +++ b/iodbc/trace/GetDiagField.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetDiagRec.c b/iodbc/trace/GetDiagRec.c index d57c5486..fcfc2456 100644 --- a/iodbc/trace/GetDiagRec.c +++ b/iodbc/trace/GetDiagRec.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetEnvAttr.c b/iodbc/trace/GetEnvAttr.c index b7826d56..0105c9e2 100644 --- a/iodbc/trace/GetEnvAttr.c +++ b/iodbc/trace/GetEnvAttr.c @@ -6,7 +6,7 @@ * SQLAllocConnect trace functions * * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetFunctions.c b/iodbc/trace/GetFunctions.c index af8aa9bb..ebb14d12 100644 --- a/iodbc/trace/GetFunctions.c +++ b/iodbc/trace/GetFunctions.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetStmtAttr.c b/iodbc/trace/GetStmtAttr.c index 9ba2e637..c5c989c7 100644 --- a/iodbc/trace/GetStmtAttr.c +++ b/iodbc/trace/GetStmtAttr.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetStmtOption.c b/iodbc/trace/GetStmtOption.c index 881546ab..7d36de52 100644 --- a/iodbc/trace/GetStmtOption.c +++ b/iodbc/trace/GetStmtOption.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/GetTypeInfo.c b/iodbc/trace/GetTypeInfo.c index 383ee5b0..23cf9e99 100644 --- a/iodbc/trace/GetTypeInfo.c +++ b/iodbc/trace/GetTypeInfo.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Info.c b/iodbc/trace/Info.c index 48f6298e..b910c998 100644 --- a/iodbc/trace/Info.c +++ b/iodbc/trace/Info.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Makefile.am b/iodbc/trace/Makefile.am index 70710e11..4b83d1df 100644 --- a/iodbc/trace/Makefile.am +++ b/iodbc/trace/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/iodbc/trace/MoreResults.c b/iodbc/trace/MoreResults.c index faf9a599..71830cd2 100644 --- a/iodbc/trace/MoreResults.c +++ b/iodbc/trace/MoreResults.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/NativeSql.c b/iodbc/trace/NativeSql.c index 037bb4b1..2283a350 100644 --- a/iodbc/trace/NativeSql.c +++ b/iodbc/trace/NativeSql.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/NumParams.c b/iodbc/trace/NumParams.c index 0dca4285..ce3b0465 100644 --- a/iodbc/trace/NumParams.c +++ b/iodbc/trace/NumParams.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/NumResultCols.c b/iodbc/trace/NumResultCols.c index 73eb4991..77244127 100644 --- a/iodbc/trace/NumResultCols.c +++ b/iodbc/trace/NumResultCols.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/ParamData.c b/iodbc/trace/ParamData.c index a763b7a1..22b43071 100644 --- a/iodbc/trace/ParamData.c +++ b/iodbc/trace/ParamData.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/ParamOptions.c b/iodbc/trace/ParamOptions.c index 80d6b5d7..8275d185 100644 --- a/iodbc/trace/ParamOptions.c +++ b/iodbc/trace/ParamOptions.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Prepare.c b/iodbc/trace/Prepare.c index d910f593..61bdfa0c 100644 --- a/iodbc/trace/Prepare.c +++ b/iodbc/trace/Prepare.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/PrimaryKeys.c b/iodbc/trace/PrimaryKeys.c index e0e78105..ac854ee4 100644 --- a/iodbc/trace/PrimaryKeys.c +++ b/iodbc/trace/PrimaryKeys.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/ProcedureColumns.c b/iodbc/trace/ProcedureColumns.c index aa9f78e2..e63b16ba 100644 --- a/iodbc/trace/ProcedureColumns.c +++ b/iodbc/trace/ProcedureColumns.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Procedures.c b/iodbc/trace/Procedures.c index 5285ea57..0be0cff6 100644 --- a/iodbc/trace/Procedures.c +++ b/iodbc/trace/Procedures.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/PutData.c b/iodbc/trace/PutData.c index d1be30c7..3a42a2fa 100644 --- a/iodbc/trace/PutData.c +++ b/iodbc/trace/PutData.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/RowCount.c b/iodbc/trace/RowCount.c index 6e10bed2..2254d19b 100644 --- a/iodbc/trace/RowCount.c +++ b/iodbc/trace/RowCount.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SetConnectAttr.c b/iodbc/trace/SetConnectAttr.c index 038d16fd..0d8c9c57 100644 --- a/iodbc/trace/SetConnectAttr.c +++ b/iodbc/trace/SetConnectAttr.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SetConnectOption.c b/iodbc/trace/SetConnectOption.c index 86abfbcd..06d2c6bc 100644 --- a/iodbc/trace/SetConnectOption.c +++ b/iodbc/trace/SetConnectOption.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SetCursorName.c b/iodbc/trace/SetCursorName.c index 377f3c10..9b4b554d 100644 --- a/iodbc/trace/SetCursorName.c +++ b/iodbc/trace/SetCursorName.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SetDescField.c b/iodbc/trace/SetDescField.c index 8736f869..85232edf 100644 --- a/iodbc/trace/SetDescField.c +++ b/iodbc/trace/SetDescField.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SetDescRec.c b/iodbc/trace/SetDescRec.c index fcfc1966..38473dae 100644 --- a/iodbc/trace/SetDescRec.c +++ b/iodbc/trace/SetDescRec.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SetEnvAttr.c b/iodbc/trace/SetEnvAttr.c index 708419b1..e4bda5e0 100644 --- a/iodbc/trace/SetEnvAttr.c +++ b/iodbc/trace/SetEnvAttr.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SetPos.c b/iodbc/trace/SetPos.c index 5e6fbf92..a78a4223 100644 --- a/iodbc/trace/SetPos.c +++ b/iodbc/trace/SetPos.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SetScrollOptions.c b/iodbc/trace/SetScrollOptions.c index 3b18dbc7..be97e20d 100644 --- a/iodbc/trace/SetScrollOptions.c +++ b/iodbc/trace/SetScrollOptions.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SetStmtAttr.c b/iodbc/trace/SetStmtAttr.c index fa5bf53d..152a4d7c 100644 --- a/iodbc/trace/SetStmtAttr.c +++ b/iodbc/trace/SetStmtAttr.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SetStmtOption.c b/iodbc/trace/SetStmtOption.c index 8c35bc30..b099d3f0 100644 --- a/iodbc/trace/SetStmtOption.c +++ b/iodbc/trace/SetStmtOption.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/SpecialColumns.c b/iodbc/trace/SpecialColumns.c index c702493f..032d0ff9 100644 --- a/iodbc/trace/SpecialColumns.c +++ b/iodbc/trace/SpecialColumns.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Statistics.c b/iodbc/trace/Statistics.c index e4d13237..732ef185 100644 --- a/iodbc/trace/Statistics.c +++ b/iodbc/trace/Statistics.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/TablePrivileges.c b/iodbc/trace/TablePrivileges.c index fcf9002c..c8a9b133 100644 --- a/iodbc/trace/TablePrivileges.c +++ b/iodbc/trace/TablePrivileges.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Tables.c b/iodbc/trace/Tables.c index 23cf5b9c..235382e2 100644 --- a/iodbc/trace/Tables.c +++ b/iodbc/trace/Tables.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/Transact.c b/iodbc/trace/Transact.c index c1901bd2..171427ac 100644 --- a/iodbc/trace/Transact.c +++ b/iodbc/trace/Transact.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbc/trace/proto.h b/iodbc/trace/proto.h index 46b29831..7d2c62ab 100644 --- a/iodbc/trace/proto.h +++ b/iodbc/trace/proto.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -629,7 +629,11 @@ void trace_set_filename (char *fname); void trace_start (void); void trace_stop (void); void trace_emitc (char c); -void trace_emit (char *fmt, ...); +void trace_emit (char *fmt, ...) +#ifdef __GNUC__ + __attribute__ ((format (printf, 1, 2))) +#endif +; void trace_emit_string (SQLCHAR * str, ssize_t len, int is_utf8); void trace_emit_binary (unsigned char *str, ssize_t len); void _trace_print_function (int func, int trace_leave, int retcode); diff --git a/iodbc/trace/trace.c b/iodbc/trace/trace.c index 891e693b..9bd685f4 100644 --- a/iodbc/trace/trace.c +++ b/iodbc/trace/trace.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -467,9 +467,16 @@ trace_stop(void) fclose (trace_fp); } + MEM_FREE (trace_appname); + MEM_FREE (trace_fname); + MEM_FREE (trace_fname_template); + ODBCSharedTraceFlag = SQL_OPT_TRACE_OFF; trace_fp = NULL; trace_fp_close = 0; + trace_appname = NULL; + trace_fname = NULL; + trace_fname_template = NULL; } @@ -717,7 +724,7 @@ _trace_print_function (int func, int trace_leave, int retcode) tv.tv_sec--; tv.tv_usec += 1000000L; } - trace_emit ("\n[%06ld.%06ld]\n", tv.tv_sec, tv.tv_usec); + trace_emit ("\n[%06ld.%06ld]\n", (long) tv.tv_sec, (long) tv.tv_usec); #else trace_emit ("\n"); #endif @@ -1316,7 +1323,7 @@ _trace_bufferlen (SQLINTEGER length) } if (ptr) - trace_emit ("\t\t%-15.15s * %ld (%s)\n", "SQLINTEGER", length, ptr); + trace_emit ("\t\t%-15.15s * %ld (%s)\n", "SQLINTEGER", (long) length, ptr); else trace_emit ("\t\t%-15.15s * %ld\n", "SQLINTEGER", (long) length); } diff --git a/iodbc/trace/trace.h b/iodbc/trace/trace.h index 84fea1b7..3473f2f9 100644 --- a/iodbc/trace/trace.h +++ b/iodbc/trace/trace.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/Info.c b/iodbcadm/Info.c index f1da9168..5ead0ab6 100644 --- a/iodbcadm/Info.c +++ b/iodbcadm/Info.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/Makefile.am b/iodbcadm/Makefile.am index 508b7237..797d8c97 100644 --- a/iodbcadm/Makefile.am +++ b/iodbcadm/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/iodbcadm/drvconn.c b/iodbcadm/drvconn.c index 034f6a96..c3327dff 100644 --- a/iodbcadm/drvconn.c +++ b/iodbcadm/drvconn.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/error.c b/iodbcadm/error.c index 3bf9efd4..f0e6a987 100644 --- a/iodbcadm/error.c +++ b/iodbcadm/error.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/Makefile.am b/iodbcadm/gtk/Makefile.am index 0950c78a..3fdd354f 100644 --- a/iodbcadm/gtk/Makefile.am +++ b/iodbcadm/gtk/Makefile.am @@ -5,7 +5,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/administrator.c b/iodbcadm/gtk/administrator.c index 99e31f65..33a7df11 100644 --- a/iodbcadm/gtk/administrator.c +++ b/iodbcadm/gtk/administrator.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/confirm.c b/iodbcadm/gtk/confirm.c index 9b791452..45005c60 100644 --- a/iodbcadm/gtk/confirm.c +++ b/iodbcadm/gtk/confirm.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -266,4 +266,6 @@ create_confirmw (HWND hwnd, LPCWSTR dsn, LPCWSTR text) free(_dsn); if (_text) free(_text); + + return TRUE; } diff --git a/iodbcadm/gtk/connectionpooling.c b/iodbcadm/gtk/connectionpooling.c index 4e3f6202..6e617eea 100644 --- a/iodbcadm/gtk/connectionpooling.c +++ b/iodbcadm/gtk/connectionpooling.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/driverchooser.c b/iodbcadm/gtk/driverchooser.c index 95e755eb..ff04d73f 100644 --- a/iodbcadm/gtk/driverchooser.c +++ b/iodbcadm/gtk/driverchooser.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/driversetup.c b/iodbcadm/gtk/driversetup.c index 1aac4af7..a782fc6e 100644 --- a/iodbcadm/gtk/driversetup.c +++ b/iodbcadm/gtk/driversetup.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/dsnchooser.c b/iodbcadm/gtk/dsnchooser.c index 36110426..cb9ddae1 100644 --- a/iodbcadm/gtk/dsnchooser.c +++ b/iodbcadm/gtk/dsnchooser.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/error.xpm b/iodbcadm/gtk/error.xpm index cd5ab1a5..60bf6280 100644 --- a/iodbcadm/gtk/error.xpm +++ b/iodbcadm/gtk/error.xpm @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/errorbox.c b/iodbcadm/gtk/errorbox.c index 377d1c5e..767c7e42 100644 --- a/iodbcadm/gtk/errorbox.c +++ b/iodbcadm/gtk/errorbox.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/gensetup.c b/iodbcadm/gtk/gensetup.c index 64549b3b..0e9bc315 100644 --- a/iodbcadm/gtk/gensetup.c +++ b/iodbcadm/gtk/gensetup.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/gui.h b/iodbcadm/gtk/gui.h index 1a26159f..47c44b40 100644 --- a/iodbcadm/gtk/gui.h +++ b/iodbcadm/gtk/gui.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/img.xpm b/iodbcadm/gtk/img.xpm index 685ccd8d..c227a07a 100644 --- a/iodbcadm/gtk/img.xpm +++ b/iodbcadm/gtk/img.xpm @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/main.c b/iodbcadm/gtk/main.c index da77b6c1..ea1c745c 100644 --- a/iodbcadm/gtk/main.c +++ b/iodbcadm/gtk/main.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -170,7 +170,7 @@ main (int argc, char *argv[]) printf ("iODBC Administrator (GTK)\n"); printf ("%s\n", PACKAGE_STRING); - printf ("Copyright (C) 2000-2016 OpenLink Software\n"); + printf ("Copyright (C) 2000-2019 OpenLink Software\n"); printf ("Please report all bugs to <%s>\n\n", PACKAGE_BUGREPORT); /* Check options commands */ diff --git a/iodbcadm/gtk/messagebox.c b/iodbcadm/gtk/messagebox.c index 8fd97a34..b068bd78 100644 --- a/iodbcadm/gtk/messagebox.c +++ b/iodbcadm/gtk/messagebox.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/odbc4.xpm b/iodbcadm/gtk/odbc4.xpm index c834693a..19bd5456 100644 --- a/iodbcadm/gtk/odbc4.xpm +++ b/iodbcadm/gtk/odbc4.xpm @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/question.xpm b/iodbcadm/gtk/question.xpm index 68adf400..2c04ec75 100644 --- a/iodbcadm/gtk/question.xpm +++ b/iodbcadm/gtk/question.xpm @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gtk/translatorchooser.c b/iodbcadm/gtk/translatorchooser.c index e319057c..91285153 100644 --- a/iodbcadm/gtk/translatorchooser.c +++ b/iodbcadm/gtk/translatorchooser.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/gui.h b/iodbcadm/gui.h index 17ddf8c3..8e321c96 100644 --- a/iodbcadm/gui.h +++ b/iodbcadm/gui.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/iodbcadm.h b/iodbcadm/iodbcadm.h index 3e35b820..1256d7db 100644 --- a/iodbcadm/iodbcadm.h +++ b/iodbcadm/iodbcadm.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/Helpers.h b/iodbcadm/mac/Helpers.h index 4643b9ab..5a43956d 100644 --- a/iodbcadm/mac/Helpers.h +++ b/iodbcadm/mac/Helpers.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/Helpers.m b/iodbcadm/mac/Helpers.m index be900376..1eff0341 100644 --- a/iodbcadm/mac/Helpers.m +++ b/iodbcadm/mac/Helpers.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DSNchooserController.h b/iodbcadm/mac/IODBCadm_DSNchooserController.h index 14a42cfa..de81e8ec 100644 --- a/iodbcadm/mac/IODBCadm_DSNchooserController.h +++ b/iodbcadm/mac/IODBCadm_DSNchooserController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DSNchooserController.m b/iodbcadm/mac/IODBCadm_DSNchooserController.m index 31b202a7..f3b56472 100644 --- a/iodbcadm/mac/IODBCadm_DSNchooserController.m +++ b/iodbcadm/mac/IODBCadm_DSNchooserController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DSNmanageController.h b/iodbcadm/mac/IODBCadm_DSNmanageController.h index 3083e5ef..c489e417 100644 --- a/iodbcadm/mac/IODBCadm_DSNmanageController.h +++ b/iodbcadm/mac/IODBCadm_DSNmanageController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DSNmanageController.m b/iodbcadm/mac/IODBCadm_DSNmanageController.m index 78238768..c2264f64 100644 --- a/iodbcadm/mac/IODBCadm_DSNmanageController.m +++ b/iodbcadm/mac/IODBCadm_DSNmanageController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DriverChooseDSNController.h b/iodbcadm/mac/IODBCadm_DriverChooseDSNController.h index 3a9c6c86..f1da8cda 100644 --- a/iodbcadm/mac/IODBCadm_DriverChooseDSNController.h +++ b/iodbcadm/mac/IODBCadm_DriverChooseDSNController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DriverChooseDSNController.m b/iodbcadm/mac/IODBCadm_DriverChooseDSNController.m index d9ec52bc..4f5640d3 100644 --- a/iodbcadm/mac/IODBCadm_DriverChooseDSNController.m +++ b/iodbcadm/mac/IODBCadm_DriverChooseDSNController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DriverChooseFDSNController.h b/iodbcadm/mac/IODBCadm_DriverChooseFDSNController.h index e080878c..a5b74d29 100644 --- a/iodbcadm/mac/IODBCadm_DriverChooseFDSNController.h +++ b/iodbcadm/mac/IODBCadm_DriverChooseFDSNController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DriverChooseFDSNController.m b/iodbcadm/mac/IODBCadm_DriverChooseFDSNController.m index e2cea14a..8bd11cdf 100644 --- a/iodbcadm/mac/IODBCadm_DriverChooseFDSNController.m +++ b/iodbcadm/mac/IODBCadm_DriverChooseFDSNController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DrvConfigController.h b/iodbcadm/mac/IODBCadm_DrvConfigController.h index 0af53dc2..954f1693 100644 --- a/iodbcadm/mac/IODBCadm_DrvConfigController.h +++ b/iodbcadm/mac/IODBCadm_DrvConfigController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DrvConfigController.m b/iodbcadm/mac/IODBCadm_DrvConfigController.m index 3deb86ef..352f6ee2 100644 --- a/iodbcadm/mac/IODBCadm_DrvConfigController.m +++ b/iodbcadm/mac/IODBCadm_DrvConfigController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -154,8 +154,6 @@ - (void)parse_attrs:(const wchar_t *)attrs [_Attrs_list addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:key!=nil?key:@"", @"key", val!=nil?val:@"", @"val", nil]]; } - else - [_Attrs_list addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:@"", @"key", @"", @"val", nil]]; } } diff --git a/iodbcadm/mac/IODBCadm_DrvRemoveController.h b/iodbcadm/mac/IODBCadm_DrvRemoveController.h index 55d83778..a8293c0b 100644 --- a/iodbcadm/mac/IODBCadm_DrvRemoveController.h +++ b/iodbcadm/mac/IODBCadm_DrvRemoveController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_DrvRemoveController.m b/iodbcadm/mac/IODBCadm_DrvRemoveController.m index be8473d1..e006f704 100644 --- a/iodbcadm/mac/IODBCadm_DrvRemoveController.m +++ b/iodbcadm/mac/IODBCadm_DrvRemoveController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_KeyValController.h b/iodbcadm/mac/IODBCadm_KeyValController.h index 7cf002cc..aba7b4cc 100644 --- a/iodbcadm/mac/IODBCadm_KeyValController.h +++ b/iodbcadm/mac/IODBCadm_KeyValController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_KeyValController.m b/iodbcadm/mac/IODBCadm_KeyValController.m index 7a24dfc1..c146459f 100644 --- a/iodbcadm/mac/IODBCadm_KeyValController.m +++ b/iodbcadm/mac/IODBCadm_KeyValController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -136,9 +136,6 @@ - (void)parse_attrs:(const char *)attrs [_Attrs_list addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:key!=nil?key:@"", @"key", val!=nil?val:@"", @"val", nil]]; } - else{ - [_Attrs_list addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:@"", @"key", @"", @"val", nil]]; - } } } diff --git a/iodbcadm/mac/IODBCadm_PoolConfigController.h b/iodbcadm/mac/IODBCadm_PoolConfigController.h index 45cccdd2..1a392d40 100644 --- a/iodbcadm/mac/IODBCadm_PoolConfigController.h +++ b/iodbcadm/mac/IODBCadm_PoolConfigController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_PoolConfigController.m b/iodbcadm/mac/IODBCadm_PoolConfigController.m index de0e6037..ced18b05 100644 --- a/iodbcadm/mac/IODBCadm_PoolConfigController.m +++ b/iodbcadm/mac/IODBCadm_PoolConfigController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_SetupController.h b/iodbcadm/mac/IODBCadm_SetupController.h index 0997a25c..b32f7e3c 100644 --- a/iodbcadm/mac/IODBCadm_SetupController.h +++ b/iodbcadm/mac/IODBCadm_SetupController.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/IODBCadm_SetupController.m b/iodbcadm/mac/IODBCadm_SetupController.m index 5b9da54d..a72097fc 100644 --- a/iodbcadm/mac/IODBCadm_SetupController.m +++ b/iodbcadm/mac/IODBCadm_SetupController.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/gui.h b/iodbcadm/mac/gui.h index eba9bb05..94ffab71 100644 --- a/iodbcadm/mac/gui.h +++ b/iodbcadm/mac/gui.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/translatorchooser.c b/iodbcadm/mac/translatorchooser.c index a60c2b9b..40c6d950 100644 --- a/iodbcadm/mac/translatorchooser.c +++ b/iodbcadm/mac/translatorchooser.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/utils.h b/iodbcadm/mac/utils.h index 445f0752..64b0168b 100644 --- a/iodbcadm/mac/utils.h +++ b/iodbcadm/mac/utils.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcadm/mac/utils.m b/iodbcadm/mac/utils.m index bf1544ec..1225a16c 100644 --- a/iodbcadm/mac/utils.m +++ b/iodbcadm/mac/utils.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/Info.c b/iodbcinst/Info.c index 8b082aea..5ece1c41 100644 --- a/iodbcinst/Info.c +++ b/iodbcinst/Info.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/Makefile.am b/iodbcinst/Makefile.am index e19c0eff..6b4ffe58 100644 --- a/iodbcinst/Makefile.am +++ b/iodbcinst/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/iodbcinst/SQLConfigDataSource.c b/iodbcinst/SQLConfigDataSource.c index 5fe8c974..caf66c6c 100644 --- a/iodbcinst/SQLConfigDataSource.c +++ b/iodbcinst/SQLConfigDataSource.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLConfigDriver.c b/iodbcinst/SQLConfigDriver.c index 69f3374e..4512ce6e 100644 --- a/iodbcinst/SQLConfigDriver.c +++ b/iodbcinst/SQLConfigDriver.c @@ -8,7 +8,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLCreateDataSource.c b/iodbcinst/SQLCreateDataSource.c index 95dba935..0ac4b6d7 100644 --- a/iodbcinst/SQLCreateDataSource.c +++ b/iodbcinst/SQLCreateDataSource.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLGetAvailableDrivers.c b/iodbcinst/SQLGetAvailableDrivers.c index c9957488..c156b3f3 100644 --- a/iodbcinst/SQLGetAvailableDrivers.c +++ b/iodbcinst/SQLGetAvailableDrivers.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLGetConfigMode.c b/iodbcinst/SQLGetConfigMode.c index 5674776b..83eb98b7 100644 --- a/iodbcinst/SQLGetConfigMode.c +++ b/iodbcinst/SQLGetConfigMode.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLGetInstalledDrivers.c b/iodbcinst/SQLGetInstalledDrivers.c index fdc703cb..f5adc562 100644 --- a/iodbcinst/SQLGetInstalledDrivers.c +++ b/iodbcinst/SQLGetInstalledDrivers.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLGetPrivateProfileString.c b/iodbcinst/SQLGetPrivateProfileString.c index 96c6e7b7..fa4ddd49 100644 --- a/iodbcinst/SQLGetPrivateProfileString.c +++ b/iodbcinst/SQLGetPrivateProfileString.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLGetTranslator.c b/iodbcinst/SQLGetTranslator.c index 1c8d8a0a..60a9c231 100644 --- a/iodbcinst/SQLGetTranslator.c +++ b/iodbcinst/SQLGetTranslator.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLInstallDriver.c b/iodbcinst/SQLInstallDriver.c index 8ccb34be..119d4d75 100644 --- a/iodbcinst/SQLInstallDriver.c +++ b/iodbcinst/SQLInstallDriver.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLInstallDriverEx.c b/iodbcinst/SQLInstallDriverEx.c index 0e0785fd..d83971e8 100644 --- a/iodbcinst/SQLInstallDriverEx.c +++ b/iodbcinst/SQLInstallDriverEx.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLInstallDriverManager.c b/iodbcinst/SQLInstallDriverManager.c index 269be01b..3a435f18 100644 --- a/iodbcinst/SQLInstallDriverManager.c +++ b/iodbcinst/SQLInstallDriverManager.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLInstallODBC.c b/iodbcinst/SQLInstallODBC.c index eedd1a2d..319b4f76 100644 --- a/iodbcinst/SQLInstallODBC.c +++ b/iodbcinst/SQLInstallODBC.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLInstallTranslator.c b/iodbcinst/SQLInstallTranslator.c index 4aff4e8b..d985cc6e 100644 --- a/iodbcinst/SQLInstallTranslator.c +++ b/iodbcinst/SQLInstallTranslator.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLInstallTranslatorEx.c b/iodbcinst/SQLInstallTranslatorEx.c index d4889285..68f9e6f6 100644 --- a/iodbcinst/SQLInstallTranslatorEx.c +++ b/iodbcinst/SQLInstallTranslatorEx.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLInstallerError.c b/iodbcinst/SQLInstallerError.c index c901d1af..f360736d 100644 --- a/iodbcinst/SQLInstallerError.c +++ b/iodbcinst/SQLInstallerError.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLManageDataSource.c b/iodbcinst/SQLManageDataSource.c index f237a8a0..2b5b2bfd 100644 --- a/iodbcinst/SQLManageDataSource.c +++ b/iodbcinst/SQLManageDataSource.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLPostInstallerError.c b/iodbcinst/SQLPostInstallerError.c index bee1323e..5ba8ab18 100644 --- a/iodbcinst/SQLPostInstallerError.c +++ b/iodbcinst/SQLPostInstallerError.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLReadFileDSN.c b/iodbcinst/SQLReadFileDSN.c index dad802cf..f5abea72 100644 --- a/iodbcinst/SQLReadFileDSN.c +++ b/iodbcinst/SQLReadFileDSN.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLRemoveDSNFromIni.c b/iodbcinst/SQLRemoveDSNFromIni.c index 86735589..437de08c 100644 --- a/iodbcinst/SQLRemoveDSNFromIni.c +++ b/iodbcinst/SQLRemoveDSNFromIni.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLRemoveDefaultDataSource.c b/iodbcinst/SQLRemoveDefaultDataSource.c index 49e170d0..8e70843b 100644 --- a/iodbcinst/SQLRemoveDefaultDataSource.c +++ b/iodbcinst/SQLRemoveDefaultDataSource.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLRemoveDriver.c b/iodbcinst/SQLRemoveDriver.c index 74a4b497..d3f79b19 100644 --- a/iodbcinst/SQLRemoveDriver.c +++ b/iodbcinst/SQLRemoveDriver.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLRemoveDriverManager.c b/iodbcinst/SQLRemoveDriverManager.c index 2603e518..99194228 100644 --- a/iodbcinst/SQLRemoveDriverManager.c +++ b/iodbcinst/SQLRemoveDriverManager.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLRemoveTranslator.c b/iodbcinst/SQLRemoveTranslator.c index 17cbffec..782c8f26 100644 --- a/iodbcinst/SQLRemoveTranslator.c +++ b/iodbcinst/SQLRemoveTranslator.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLSetConfigMode.c b/iodbcinst/SQLSetConfigMode.c index 7eb680e6..1e99db21 100644 --- a/iodbcinst/SQLSetConfigMode.c +++ b/iodbcinst/SQLSetConfigMode.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLValidDSN.c b/iodbcinst/SQLValidDSN.c index 1e6d2ad3..a81a3b59 100644 --- a/iodbcinst/SQLValidDSN.c +++ b/iodbcinst/SQLValidDSN.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLWriteDSNToIni.c b/iodbcinst/SQLWriteDSNToIni.c index 9629d14a..a9b12cd5 100644 --- a/iodbcinst/SQLWriteDSNToIni.c +++ b/iodbcinst/SQLWriteDSNToIni.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLWriteFileDSN.c b/iodbcinst/SQLWriteFileDSN.c index f3c22a06..aad941bd 100644 --- a/iodbcinst/SQLWriteFileDSN.c +++ b/iodbcinst/SQLWriteFileDSN.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/SQLWritePrivateProfileString.c b/iodbcinst/SQLWritePrivateProfileString.c index 6b7a5cb1..a7788a14 100644 --- a/iodbcinst/SQLWritePrivateProfileString.c +++ b/iodbcinst/SQLWritePrivateProfileString.c @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/dlf.c b/iodbcinst/dlf.c index 940696a3..2ffbfad5 100644 --- a/iodbcinst/dlf.c +++ b/iodbcinst/dlf.c @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/dlf.h b/iodbcinst/dlf.h index e51153d9..53f217f8 100644 --- a/iodbcinst/dlf.h +++ b/iodbcinst/dlf.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/inifile.c b/iodbcinst/inifile.c index cad1ac76..a5343d52 100644 --- a/iodbcinst/inifile.c +++ b/iodbcinst/inifile.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -1315,7 +1315,8 @@ _iodbcdm_list_entries (PCONFIG pCfg, LPCSTR lpszSection, LPSTR lpszRetBuffer, in if (!_iodbcdm_cfg_find (pCfg, (char*)lpszSection, NULL)) { - while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg)) + while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg) + && pCfg->section) { if (_iodbcdm_cfg_section (pCfg)) break; diff --git a/iodbcinst/inifile.h b/iodbcinst/inifile.h index 89556633..c891413a 100644 --- a/iodbcinst/inifile.h +++ b/iodbcinst/inifile.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/iodbc_error.c b/iodbcinst/iodbc_error.c index 2a7a5d67..d2fc7413 100644 --- a/iodbcinst/iodbc_error.c +++ b/iodbcinst/iodbc_error.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/iodbc_error.h b/iodbcinst/iodbc_error.h index dda9a8a1..22c5f55b 100644 --- a/iodbcinst/iodbc_error.h +++ b/iodbcinst/iodbc_error.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/misc.c b/iodbcinst/misc.c index 40bd4251..59e76471 100644 --- a/iodbcinst/misc.c +++ b/iodbcinst/misc.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/misc.h b/iodbcinst/misc.h index 6a547192..2f735f1a 100644 --- a/iodbcinst/misc.h +++ b/iodbcinst/misc.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/unicode.c b/iodbcinst/unicode.c index 0531bd5e..237e7ae4 100644 --- a/iodbcinst/unicode.c +++ b/iodbcinst/unicode.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/iodbcinst/unicode.h b/iodbcinst/unicode.h index 55d5b163..37ebf069 100644 --- a/iodbcinst/unicode.h +++ b/iodbcinst/unicode.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/GNUmakefile b/mac/GNUmakefile index 32f4a55c..a4d5491c 100644 --- a/mac/GNUmakefile +++ b/mac/GNUmakefile @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/mac/framework-include.sh b/mac/framework-include.sh index 3c6ded88..33fced19 100755 --- a/mac/framework-include.sh +++ b/mac/framework-include.sh @@ -4,7 +4,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/mac/iODBC/English.lproj/InfoPlist.strings b/mac/iODBC/English.lproj/InfoPlist.strings index ec6672bd..cca57f45 100644 Binary files a/mac/iODBC/English.lproj/InfoPlist.strings and b/mac/iODBC/English.lproj/InfoPlist.strings differ diff --git a/mac/iODBC/Info-iODBC.plist b/mac/iODBC/Info-iODBC.plist index ef0f96f3..7f1fd977 100644 --- a/mac/iODBC/Info-iODBC.plist +++ b/mac/iODBC/Info-iODBC.plist @@ -7,7 +7,7 @@ CFBundleExecutable iODBC CFBundleGetInfoString - iODBC Driver Manager Library + iODBC version 3.52.13, Copyright 1995-2019, OpenLink Software CFBundleIconFile CFBundleIdentifier @@ -19,11 +19,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.52.12 + 3.52.13 CFBundleSignature odbc CFBundleVersion - 3.52.12 + 3.52.13 CSResourcesFileMapped diff --git a/mac/iODBC/iODBC.xcodeproj/project.pbxproj b/mac/iODBC/iODBC.xcodeproj/project.pbxproj index a8e3477f..ac81b3ee 100644 --- a/mac/iODBC/iODBC.xcodeproj/project.pbxproj +++ b/mac/iODBC/iODBC.xcodeproj/project.pbxproj @@ -678,9 +678,9 @@ x86_64, ); COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 3.52.12; + DYLIB_CURRENT_VERSION = 3.52.13; EXPORTED_SYMBOLS_FILE = ""; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBCinst/build/Development, @@ -732,9 +732,9 @@ x86_64, ); COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 3.52.12; + DYLIB_CURRENT_VERSION = 3.52.13; EXPORTED_SYMBOLS_FILE = ../../mac/iodbc.exp; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBCinst/build/Deployment, diff --git a/mac/iODBCadm/English.lproj/InfoPlist.strings b/mac/iODBCadm/English.lproj/InfoPlist.strings index 0871d782..433df933 100644 --- a/mac/iODBCadm/English.lproj/InfoPlist.strings +++ b/mac/iODBCadm/English.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "iODBCadm"; -CFBundleShortVersionString = "iODBCadm version 3.52.12"; -CFBundleGetInfoString = "iODBCadm version 3.52.12, Copyright 1995-2016, OpenLink Software"; -NSHumanReadableCopyright = "Copyright 1995-2016, OpenLink Software"; +CFBundleShortVersionString = "iODBCadm version 3.52.13"; +CFBundleGetInfoString = "iODBCadm version 3.52.13, Copyright 1995-2019, OpenLink Software"; +NSHumanReadableCopyright = "Copyright 1995-2019, OpenLink Software"; diff --git a/mac/iODBCadm/Info-iODBCadm.plist b/mac/iODBCadm/Info-iODBCadm.plist index 7b8bc129..90d0847b 100644 --- a/mac/iODBCadm/Info-iODBCadm.plist +++ b/mac/iODBCadm/Info-iODBCadm.plist @@ -7,7 +7,7 @@ CFBundleExecutable iODBCadm CFBundleGetInfoString - iODBC Adminstrator Library + iODBCadm version 3.52.13, Copyright 1995-2019, OpenLink Software CFBundleIconFile CFBundleIdentifier @@ -19,11 +19,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.52.12 + 3.52.13 CFBundleSignature odbc CFBundleVersion - 3.52.12 + 3.52.13 CFPlugInDynamicRegisterFunction CFPlugInDynamicRegistration diff --git a/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj b/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj index 2314ab18..3495d7b3 100644 --- a/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj +++ b/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj @@ -558,10 +558,10 @@ x86_64, ); COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 3.52.12; + DYLIB_CURRENT_VERSION = 3.52.13; EXPORTED_SYMBOLS_FILE = ../../mac/iodbcadm.exp; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBCinst/build/Development, diff --git a/mac/iODBCadministrator/AppDelegate.h b/mac/iODBCadministrator/AppDelegate.h index 99c21f5e..040a412c 100644 --- a/mac/iODBCadministrator/AppDelegate.h +++ b/mac/iODBCadministrator/AppDelegate.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCadministrator/AppDelegate.m b/mac/iODBCadministrator/AppDelegate.m index 9d3f439c..5b475346 100644 --- a/mac/iODBCadministrator/AppDelegate.m +++ b/mac/iODBCadministrator/AppDelegate.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCadministrator/English.lproj/InfoPlist.strings b/mac/iODBCadministrator/English.lproj/InfoPlist.strings index 1e16faf8..bc1513bd 100644 --- a/mac/iODBCadministrator/English.lproj/InfoPlist.strings +++ b/mac/iODBCadministrator/English.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "iODBC Administrator"; -CFBundleShortVersionString = "iODBC Administrator version 3.52.12"; -CFBundleGetInfoString = "iODBC Administrator version 3.52.12, Copyright 1995-2016, OpenLink Software"; -NSHumanReadableCopyright = "Copyright © 1995-2016, OpenLink Software"; +CFBundleShortVersionString = "iODBC Administrator version 3.52.13"; +CFBundleGetInfoString = "iODBC Administrator version 3.52.13, Copyright 1995-2019, OpenLink Software"; +NSHumanReadableCopyright = "Copyright © 1995-2019, OpenLink Software"; diff --git a/mac/iODBCadministrator/Info-iODBC_Administrator.plist b/mac/iODBCadministrator/Info-iODBC_Administrator.plist index 4a9dac17..4a43c0c3 100644 --- a/mac/iODBCadministrator/Info-iODBC_Administrator.plist +++ b/mac/iODBCadministrator/Info-iODBC_Administrator.plist @@ -7,7 +7,7 @@ CFBundleExecutable iODBC Administrator CFBundleGetInfoString - iODBC Administrator + iODBC Administrator version 3.52.13, Copyright 1995-2019, OpenLink Software CFBundleIconFile iODBCAdministrator.icns CFBundleIdentifier @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.52.12 + 3.52.13 CFBundleSignature odbc CFBundleVersion - 3.52.12 + 3.52.13 NSMainNibFile MainMenu NSPrincipalClass diff --git a/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj b/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj index ca506b17..8a624e9f 100644 --- a/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj +++ b/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj @@ -273,10 +273,10 @@ i386, ); COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = ""; - DYLIB_CURRENT_VERSION = 3.52.12; + DYLIB_CURRENT_VERSION = 3.52.13; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Deployment, ../../mac/iODBC/build, diff --git a/mac/iODBCadministrator/main.m b/mac/iODBCadministrator/main.m index 7df1a632..1e7a7ccd 100644 --- a/mac/iODBCadministrator/main.m +++ b/mac/iODBCadministrator/main.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -108,7 +108,7 @@ printf ("OpenLink iODBC Administrator (Mac OS X)\n"); printf ("iODBC Driver Manager %s\n", VERSION); - printf ("Copyright (C) 2000-2016 OpenLink Software\n"); + printf ("Copyright (C) 2000-2019 OpenLink Software\n"); printf ("Please report all bugs to \n"); /* Check options commands */ diff --git a/mac/iODBCadministrator64/AppDelegate.h b/mac/iODBCadministrator64/AppDelegate.h index 99c21f5e..040a412c 100644 --- a/mac/iODBCadministrator64/AppDelegate.h +++ b/mac/iODBCadministrator64/AppDelegate.h @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCadministrator64/AppDelegate.m b/mac/iODBCadministrator64/AppDelegate.m index 9d3f439c..5b475346 100644 --- a/mac/iODBCadministrator64/AppDelegate.m +++ b/mac/iODBCadministrator64/AppDelegate.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCadministrator64/English.lproj/InfoPlist.strings b/mac/iODBCadministrator64/English.lproj/InfoPlist.strings index c637a0e2..088c5b4b 100644 --- a/mac/iODBCadministrator64/English.lproj/InfoPlist.strings +++ b/mac/iODBCadministrator64/English.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "iODBC Administrator64"; -CFBundleShortVersionString = "iODBC Administrator64 version 3.52.12"; -CFBundleGetInfoString = "iODBC Administrator64 version 3.52.12, Copyright 1995-2016, OpenLink Software"; -NSHumanReadableCopyright = "Copyright © 1995-2016, OpenLink Software"; +CFBundleShortVersionString = "iODBC Administrator64 version 3.52.13"; +CFBundleGetInfoString = "iODBC Administrator64 version 3.52.13, Copyright 1995-2019, OpenLink Software"; +NSHumanReadableCopyright = "Copyright © 1995-2019, OpenLink Software"; diff --git a/mac/iODBCadministrator64/Info-iODBC_Administrator.plist b/mac/iODBCadministrator64/Info-iODBC_Administrator.plist index b2d85303..81b5d273 100644 --- a/mac/iODBCadministrator64/Info-iODBC_Administrator.plist +++ b/mac/iODBCadministrator64/Info-iODBC_Administrator.plist @@ -7,7 +7,7 @@ CFBundleExecutable iODBC Administrator64 CFBundleGetInfoString - iODBC Administrator64 + iODBC Administrator64 version 3.52.13, Copyright 1995-2019, OpenLink Software CFBundleIconFile iODBCAdministrator.icns CFBundleIdentifier @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.52.12 + 3.52.13 CFBundleSignature odbc CFBundleVersion - 3.52.12 + 3.52.13 NSMainNibFile MainMenu NSPrincipalClass diff --git a/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj b/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj index b0c3ee24..26b510b6 100644 --- a/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj +++ b/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj @@ -270,10 +270,10 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = ""; - DYLIB_CURRENT_VERSION = 3.52.12; + DYLIB_CURRENT_VERSION = 3.52.13; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Deployment, ../../mac/iODBC/build, diff --git a/mac/iODBCadministrator64/main.m b/mac/iODBCadministrator64/main.m index 7df1a632..1e7a7ccd 100644 --- a/mac/iODBCadministrator64/main.m +++ b/mac/iODBCadministrator64/main.m @@ -5,7 +5,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -108,7 +108,7 @@ printf ("OpenLink iODBC Administrator (Mac OS X)\n"); printf ("iODBC Driver Manager %s\n", VERSION); - printf ("Copyright (C) 2000-2016 OpenLink Software\n"); + printf ("Copyright (C) 2000-2019 OpenLink Software\n"); printf ("Please report all bugs to \n"); /* Check options commands */ diff --git a/mac/iODBCcfmbridge/Info.c b/mac/iODBCcfmbridge/Info.c index 0930f957..d42842ae 100644 --- a/mac/iODBCcfmbridge/Info.c +++ b/mac/iODBCcfmbridge/Info.c @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCcfmbridge/iodbccfm.c b/mac/iODBCcfmbridge/iodbccfm.c index 8ed80455..27e5204f 100644 --- a/mac/iODBCcfmbridge/iodbccfm.c +++ b/mac/iODBCcfmbridge/iodbccfm.c @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCcfmbridge/iodbccfm.h b/mac/iODBCcfmbridge/iodbccfm.h index a02addea..68a56a20 100644 --- a/mac/iODBCcfmbridge/iodbccfm.h +++ b/mac/iODBCcfmbridge/iodbccfm.h @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCcfmbridge/iodbccfm.r b/mac/iODBCcfmbridge/iodbccfm.r index 8e253c22..16a5c4a9 100644 --- a/mac/iODBCcfmbridge/iodbccfm.r +++ b/mac/iODBCcfmbridge/iodbccfm.r @@ -5,7 +5,7 @@ * * Ressources for the iODBC CFM Bridge * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/DSNchooserController.h b/mac/iODBCdemo/DSNchooserController.h index 00dbff66..b415e2c8 100644 --- a/mac/iODBCdemo/DSNchooserController.h +++ b/mac/iODBCdemo/DSNchooserController.h @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/DSNchooserController.m b/mac/iODBCdemo/DSNchooserController.m index 98941721..103d7562 100644 --- a/mac/iODBCdemo/DSNchooserController.m +++ b/mac/iODBCdemo/DSNchooserController.m @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/DemoAnsi/English.lproj/InfoPlist.strings b/mac/iODBCdemo/DemoAnsi/English.lproj/InfoPlist.strings index 52dc284a..b71a36b6 100644 Binary files a/mac/iODBCdemo/DemoAnsi/English.lproj/InfoPlist.strings and b/mac/iODBCdemo/DemoAnsi/English.lproj/InfoPlist.strings differ diff --git a/mac/iODBCdemo/DemoAnsi/InfoAnsi.plist b/mac/iODBCdemo/DemoAnsi/InfoAnsi.plist index b714a059..d52446d7 100644 --- a/mac/iODBCdemo/DemoAnsi/InfoAnsi.plist +++ b/mac/iODBCdemo/DemoAnsi/InfoAnsi.plist @@ -6,6 +6,8 @@ English CFBundleExecutable iODBC Demo Ansi + CFBundleGetInfoString + iODBC Demo version 1.4, Copyright 2006-2019, OpenLink Software CFBundleIconFile iODBCdemo.icns CFBundleIdentifier diff --git a/mac/iODBCdemo/DemoUnicode/English.lproj/InfoPlist.strings b/mac/iODBCdemo/DemoUnicode/English.lproj/InfoPlist.strings index 69f43374..66cf6766 100644 Binary files a/mac/iODBCdemo/DemoUnicode/English.lproj/InfoPlist.strings and b/mac/iODBCdemo/DemoUnicode/English.lproj/InfoPlist.strings differ diff --git a/mac/iODBCdemo/DemoUnicode/InfoUnicode.plist b/mac/iODBCdemo/DemoUnicode/InfoUnicode.plist index 1f88f908..2abce034 100644 --- a/mac/iODBCdemo/DemoUnicode/InfoUnicode.plist +++ b/mac/iODBCdemo/DemoUnicode/InfoUnicode.plist @@ -6,6 +6,8 @@ English CFBundleExecutable iODBC Demo Unicode + CFBundleGetInfoString + iODBC Demo version 1.4, Copyright 2006-2019, OpenLink Software CFBundleIconFile iODBCdemo.icns CFBundleIdentifier diff --git a/mac/iODBCdemo/ExecController.h b/mac/iODBCdemo/ExecController.h index 78dd6b64..40e08b27 100644 --- a/mac/iODBCdemo/ExecController.h +++ b/mac/iODBCdemo/ExecController.h @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/ExecController.m b/mac/iODBCdemo/ExecController.m index cc21a554..cc53d56a 100644 --- a/mac/iODBCdemo/ExecController.m +++ b/mac/iODBCdemo/ExecController.m @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/Helpers.h b/mac/iODBCdemo/Helpers.h index b29d1283..717ea082 100644 --- a/mac/iODBCdemo/Helpers.h +++ b/mac/iODBCdemo/Helpers.h @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/Helpers.m b/mac/iODBCdemo/Helpers.m index d7da1c52..d626cb3a 100644 --- a/mac/iODBCdemo/Helpers.m +++ b/mac/iODBCdemo/Helpers.m @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/LinkTextFieldCell.h b/mac/iODBCdemo/LinkTextFieldCell.h index f58f72a5..19f1c7d0 100644 --- a/mac/iODBCdemo/LinkTextFieldCell.h +++ b/mac/iODBCdemo/LinkTextFieldCell.h @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/LinkTextFieldCell.m b/mac/iODBCdemo/LinkTextFieldCell.m index 7892fd78..6e5e8c79 100644 --- a/mac/iODBCdemo/LinkTextFieldCell.m +++ b/mac/iODBCdemo/LinkTextFieldCell.m @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/NSAttributedStringAdditions.h b/mac/iODBCdemo/NSAttributedStringAdditions.h index 89814b84..6860db66 100644 --- a/mac/iODBCdemo/NSAttributedStringAdditions.h +++ b/mac/iODBCdemo/NSAttributedStringAdditions.h @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/NSAttributedStringAdditions.m b/mac/iODBCdemo/NSAttributedStringAdditions.m index 9dc9a806..9f33493f 100644 --- a/mac/iODBCdemo/NSAttributedStringAdditions.m +++ b/mac/iODBCdemo/NSAttributedStringAdditions.m @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/NSResWindow.h b/mac/iODBCdemo/NSResWindow.h index ab3a7441..0899daba 100644 --- a/mac/iODBCdemo/NSResWindow.h +++ b/mac/iODBCdemo/NSResWindow.h @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/NSResWindow.m b/mac/iODBCdemo/NSResWindow.m index 5d966ca2..6fcde4ed 100644 --- a/mac/iODBCdemo/NSResWindow.m +++ b/mac/iODBCdemo/NSResWindow.m @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/TestController.h b/mac/iODBCdemo/TestController.h index 6904b389..3f69d493 100644 --- a/mac/iODBCdemo/TestController.h +++ b/mac/iODBCdemo/TestController.h @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/TestController.m b/mac/iODBCdemo/TestController.m index 21fdb63d..0028f63e 100644 --- a/mac/iODBCdemo/TestController.m +++ b/mac/iODBCdemo/TestController.m @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdemo/main.m b/mac/iODBCdemo/main.m index 0df99228..225bd86e 100644 --- a/mac/iODBCdemo/main.m +++ b/mac/iODBCdemo/main.m @@ -3,7 +3,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/mac/iODBCdrvproxy/English.lproj/InfoPlist.strings b/mac/iODBCdrvproxy/English.lproj/InfoPlist.strings index 40592a75..ddcc078a 100644 --- a/mac/iODBCdrvproxy/English.lproj/InfoPlist.strings +++ b/mac/iODBCdrvproxy/English.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "iODBCdrvproxy"; -CFBundleShortVersionString = "iODBCdrvproxy version 3.52.12"; -CFBundleGetInfoString = "iODBCdrvproxy version 3.52.12, Copyright 1995-2016, OpenLink Software"; -NSHumanReadableCopyright = "Copyright © 1995-2016, OpenLink Software"; +CFBundleShortVersionString = "iODBCdrvproxy version 3.52.13"; +CFBundleGetInfoString = "iODBCdrvproxy version 3.52.13, Copyright 1995-2019, OpenLink Software"; +NSHumanReadableCopyright = "Copyright © 1995-2019, OpenLink Software"; diff --git a/mac/iODBCdrvproxy/Info-iODBCdrvproxy.plist b/mac/iODBCdrvproxy/Info-iODBCdrvproxy.plist index ff04aa63..4dd68266 100644 --- a/mac/iODBCdrvproxy/Info-iODBCdrvproxy.plist +++ b/mac/iODBCdrvproxy/Info-iODBCdrvproxy.plist @@ -7,7 +7,7 @@ CFBundleExecutable iODBCdrvproxy CFBundleGetInfoString - iODBC Driver Proxy Library + iODBCdrvproxy version 3.52.13, Copyright 1995-2019, OpenLink Software CFBundleIconFile CFBundleIdentifier @@ -19,11 +19,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.52.12 + 3.52.13 CFBundleSignature odbc CFBundleVersion - 3.52.12 + 3.52.13 CFPlugInDynamicRegisterFunction CFPlugInDynamicRegistration diff --git a/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj b/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj index 6f7ff8f4..35024979 100644 --- a/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj +++ b/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj @@ -367,11 +367,11 @@ x86_64, ); COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 3.52.12; - "Current project version" = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; + "Current project version" = 3.52.13; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 3.52.12; + DYLIB_CURRENT_VERSION = 3.52.13; EXPORTED_SYMBOLS_FILE = ../../mac/drvproxy.exp; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBCinst/build/Development, diff --git a/mac/iODBCinst/English.lproj/InfoPlist.strings b/mac/iODBCinst/English.lproj/InfoPlist.strings index e8cf2e5a..edbfabe5 100644 Binary files a/mac/iODBCinst/English.lproj/InfoPlist.strings and b/mac/iODBCinst/English.lproj/InfoPlist.strings differ diff --git a/mac/iODBCinst/Info-iODBCinst.plist b/mac/iODBCinst/Info-iODBCinst.plist index 7052210d..18e310d2 100644 --- a/mac/iODBCinst/Info-iODBCinst.plist +++ b/mac/iODBCinst/Info-iODBCinst.plist @@ -7,7 +7,7 @@ CFBundleExecutable iODBCinst CFBundleGetInfoString - iODBC Configuration Manager Library + iODBCinst version 3.52.13, Copyright 1995-2019, OpenLink Software CFBundleIconFile CFBundleIdentifier @@ -19,11 +19,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.52.12 + 3.52.13 CFBundleSignature odbc CFBundleVersion - 3.52.12 + 3.52.13 CSResourcesFileMapped diff --git a/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj b/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj index b823ec1d..0f1ae4eb 100644 --- a/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj +++ b/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj @@ -429,9 +429,9 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 3.52.12; + DYLIB_CURRENT_VERSION = 3.52.13; EXPORTED_SYMBOLS_FILE = ../../mac/iodbcinst.exp; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Deployment, @@ -476,9 +476,9 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 3.52.12; + DYLIB_CURRENT_VERSION = 3.52.13; EXPORTED_SYMBOLS_FILE = ../../mac/iodbcinst.exp; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Deployment, diff --git a/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj b/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj index 0c632bbf..53c3b5be 100644 --- a/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj +++ b/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj @@ -17,8 +17,8 @@ isa = PBXBuildStyle; buildSettings = { COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 3.52.12; - DYLIB_CURRENT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; + DYLIB_CURRENT_VERSION = 3.52.13; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Development, ../../mac/iODBC/build, @@ -43,9 +43,9 @@ isa = PBXBuildStyle; buildSettings = { COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; DEPLOYMENT_LOCATION = NO; - DYLIB_CURRENT_VERSION = 3.52.12; + DYLIB_CURRENT_VERSION = 3.52.13; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Deployment, ../../mac/iODBC/build, @@ -223,8 +223,8 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 3.52.12; - DYLIB_CURRENT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; + DYLIB_CURRENT_VERSION = 3.52.13; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Development, ../../mac/iODBC/build, @@ -260,9 +260,9 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; DEPLOYMENT_LOCATION = NO; - DYLIB_CURRENT_VERSION = 3.52.12; + DYLIB_CURRENT_VERSION = 3.52.13; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Deployment, ../../mac/iODBC/build, diff --git a/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj b/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj index 3c2c75ac..c4143f47 100644 --- a/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj +++ b/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj @@ -17,8 +17,8 @@ isa = PBXBuildStyle; buildSettings = { COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 3.52.12; - DYLIB_CURRENT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; + DYLIB_CURRENT_VERSION = 3.52.13; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Development, ../../mac/iODBC/build, @@ -44,8 +44,8 @@ isa = PBXBuildStyle; buildSettings = { COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 3.52.12; - DYLIB_CURRENT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; + DYLIB_CURRENT_VERSION = 3.52.13; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Deployment, ../../mac/iODBC/build, @@ -224,8 +224,8 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 3.52.12; - DYLIB_CURRENT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; + DYLIB_CURRENT_VERSION = 3.52.13; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Development, ../../mac/iODBC/build, @@ -261,8 +261,8 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 3.52.12; - DYLIB_CURRENT_VERSION = 3.52.12; + CURRENT_PROJECT_VERSION = 3.52.13; + DYLIB_CURRENT_VERSION = 3.52.13; FRAMEWORK_SEARCH_PATHS = ( ../../mac/iODBC/build/Deployment, ../../mac/iODBC/build, diff --git a/mac/iodbc-config.macosx b/mac/iodbc-config.macosx index b8a376ef..822db347 100755 --- a/mac/iodbc-config.macosx +++ b/mac/iodbc-config.macosx @@ -2,7 +2,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following @@ -89,7 +89,7 @@ usage() cat < Usage: diff --git a/mac/link-inclibs.sh b/mac/link-inclibs.sh index 690b0e2a..36eba79d 100755 --- a/mac/link-inclibs.sh +++ b/mac/link-inclibs.sh @@ -4,7 +4,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/man/Makefile.am b/man/Makefile.am index e4a53fc7..6317c809 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/man/iodbc-config.1.in b/man/iodbc-config.1.in index de9b00bb..6f4d9552 100644 --- a/man/iodbc-config.1.in +++ b/man/iodbc-config.1.in @@ -79,7 +79,7 @@ variable, before using the following Makefile fragment: .fi .SH COPYRIGHT -Copyright \(co 1996-2016 by OpenLink Software +Copyright \(co 1996-2019 by OpenLink Software .SH AUTHOR iODBC Administrator diff --git a/man/iodbcadm-gtk.1.in b/man/iodbcadm-gtk.1.in index 927394f7..926c3125 100644 --- a/man/iodbcadm-gtk.1.in +++ b/man/iodbcadm-gtk.1.in @@ -12,7 +12,7 @@ This program is a graphical ODBC administration program using the GTK+ widget set. .SH COPYRIGHT -Copyright \(co 1996-2016 by OpenLink Software +Copyright \(co 1996-2019 by OpenLink Software .SH AUTHOR iODBC Administrator diff --git a/man/iodbctest.1.in b/man/iodbctest.1.in index 1d0ca33f..dac0182b 100644 --- a/man/iodbctest.1.in +++ b/man/iodbctest.1.in @@ -138,7 +138,7 @@ odbc.ini file: .fi .SH COPYRIGHT -Copyright \(co 1996-2016 by OpenLink Software +Copyright \(co 1996-2019 by OpenLink Software .SH AUTHOR iODBC Administrator diff --git a/samples/Makefile.am b/samples/Makefile.am index bad1a9c9..d7b25ee4 100644 --- a/samples/Makefile.am +++ b/samples/Makefile.am @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/samples/Makefile.sample b/samples/Makefile.sample index 30458575..71ae47a5 100644 --- a/samples/Makefile.sample +++ b/samples/Makefile.sample @@ -3,7 +3,7 @@ # # The iODBC driver manager. # -# Copyright (C) 1996-2016 by OpenLink Software +# Copyright (C) 1996-2019 by OpenLink Software # All Rights Reserved. # # This software is released under the terms of either of the following diff --git a/samples/iodbctest.c b/samples/iodbctest.c index 3c4ab8b2..334ed09d 100644 --- a/samples/iodbctest.c +++ b/samples/iodbctest.c @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2016 by OpenLink Software + * Copyright (C) 1996-2019 by OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following