NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit091a765

committed

Don't refer to odbcinst.ini by absolute path. SQLGetPrivateProfileString

handles this.Don't install our own odbcinst.ini. That's the driver manager's business.

1 parentbb2bf2d commit091a765Copy full SHA for 091a765

File tree

3 files changed

+14

-17

lines changed

src/interfaces/odbc

3 files changed

+14

-17

lines changed

`‎src/interfaces/odbc/GNUmakefile‎`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# GNUMakefile for psqlodbc (Postgres ODBC driver)`
`4`	`4`	`#`
`5`		`-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.20 2001/09/22 22:54:32 petere Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.21 2001/09/23 13:32:24 petere Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -19,7 +19,7 @@ endif`
`19`	`19`	`SO_MAJOR_VERSION = 0`
`20`	`20`	`SO_MINOR_VERSION = 27`
`21`	`21`
`22`		`-overrideCPPFLAGS := -I$(srcdir)$(CPPFLAGS) -DODBCINSTDIR='"$(odbcinst_ini_dir)"'`
	`22`	`+overrideCPPFLAGS := -I$(srcdir)$(CPPFLAGS)`
`23`	`23`
`24`	`24`
`25`	`25`	`OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o\`
`@@ -40,6 +40,7 @@ SHLIB_LINK += -liodbcinst`
`40`	`40`	`endif`
`41`	`41`	`ifeq ($(with_unixodbc)$(with_iodbc),nono)`
`42`	`42`	`OBJS += gpps.o`
	`43`	`+overrideCPPFLAGS += -DODBCINSTDIR='"$(odbcinst_ini_dir)"'`
`43`	`44`	`endif`
`44`	`45`
`45`	`46`	`all: all-lib`
`@@ -54,16 +55,14 @@ LINK.shared += $(shlib_symbolic)`
`54`	`55`
`55`	`56`
`56`	`57`	`install: all installdirs`
`57`		`-$(INSTALL_DATA)$(srcdir)/odbcinst.ini$(DESTDIR)$(odbcinst_ini_dir)/odbcinst.ini`
`58`	`58`	`$(INSTALL_DATA)$(srcdir)/odbc.sql$(DESTDIR)$(datadir)/odbc.sql`
`59`	`59`	`$(MAKE) install-lib`
`60`	`60`
`61`	`61`	`installdirs:`
`62`		`-$(mkinstalldirs)$(DESTDIR)$(libdir)$(DESTDIR)$(odbcinst_ini_dir)$(DESTDIR)$(datadir)`
	`62`	`+$(mkinstalldirs)$(DESTDIR)$(libdir)$(DESTDIR)$(datadir)`
`63`	`63`
`64`	`64`	`uninstall: uninstall-lib`
`65`	`65`	`rm -f$(DESTDIR)$(datadir)/odbc.sql`
`66`		`-# XXX Uninstall the .ini file as well?`
`67`	`66`
`68`	`67`	`cleandistcleanmaintainer-clean: clean-lib`
`69`	`68`	`rm -f$(OBJS)`

`‎src/interfaces/odbc/dlg_specific.h‎`

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,20 +22,14 @@`
`22`	`22`	`#defineUNKNOWNS_AS_DONTKNOW1`
`23`	`23`	`#defineUNKNOWNS_AS_LONGEST2`
`24`	`24`
`25`		`-/INI File Stuff /`
	`25`	`+/ODBC initialization files /`
`26`	`26`	`#ifndefWIN32`
`27`	`27`	`#defineODBC_INI".odbc.ini"`
`28`		`-#ifdefODBCINSTDIR`
`29`		`-#defineODBCINST_INIODBCINSTDIR "/odbcinst.ini"`
	`28`	`+#defineODBCINST_INI"odbcinst.ini"`
`30`	`29`	`#else`
`31`		`-#defineODBCINST_INI"/etc/odbcinst.ini"`
	`30`	`+#defineODBC_INI"ODBC.INI"`
	`31`	`+#defineODBCINST_INI"ODBCINST.INI"`
`32`	`32`	`#endif`
`33`		`-#else/* WIN32 */`
`34`		`-#defineODBC_INI"ODBC.INI"/* ODBC initialization`
`35`		`- * file */`
`36`		`-#defineODBCINST_INI"ODBCINST.INI"/* ODBC Installation`
`37`		`- * file */`
`38`		`-#endif/* WIN32 */`
`39`	`33`
`40`	`34`
`41`	`35`	`#defineINI_DSNDBMS_NAME/* Name of default`

`‎src/interfaces/odbc/gpps.c‎`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,16 @@`
`43`	`43`	`#defineFALSE((BOOL)0)`
`44`	`44`	`#endif`
`45`	`45`
	`46`	`+#ifndefODBCINSTDIR`
	`47`	`+#error "ODBCINSTDIR must be defined to compile this file"`
	`48`	`+#endif`
	`49`	`+`
`46`	`50`
`47`	`51`	`/*`
`48`	`52`	`* theIniFileName is searched for in:`
`49`	`53`	`* $HOME/theIniFileName`
`50`	`54`	`* theIniFileName`
`51`		`- * ODBCINST_INI`
	`55`	`+ *ODBCINSTDIR/ODBCINST_INI`
`52`	`56`	`*/`
`53`	`57`	`DWORD`
`54`	`58`	`GetPrivateProfileString(constchartheSection,/ section name */`
`@@ -102,7 +106,7 @@ GetPrivateProfileString(const char theSection,/ section name */`
`102`	`106`	`{`
`103`	`107`	`aFile= (FILE*)fopen(theIniFileName,PG_BINARY_R);`
`104`	`108`	`if (!aFile)`
`105`		`-aFile= (FILE*)fopen(ODBCINST_INI,PG_BINARY_R);`
	`109`	`+aFile= (FILE*)fopen(ODBCINSTDIR"/"ODBCINST_INI,PG_BINARY_R);`
`106`	`110`	`}`
`107`	`111`
`108`	`112`	`aLength= (theDefault==NULL) ?0 :strlen(theDefault);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit091a765

File tree

3 files changed

3 files changed

`‎src/interfaces/odbc/GNUmakefile‎`

`‎src/interfaces/odbc/dlg_specific.h‎`

`‎src/interfaces/odbc/gpps.c‎`

0 commit comments