postgrespro
diff --git a/‎src/interfaces/odbc/GNUmakefile
Lines changed: 2 additions & 2 deletions b/‎src/interfaces/odbc/GNUmakefile
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/interfaces/odbc/convert.c
Lines changed: 10 additions & 2 deletions b/‎src/interfaces/odbc/convert.c
Lines changed: 10 additions & 2 deletions
diff --git a/‎src/interfaces/odbc/info.c
Lines changed: 0 additions & 1 deletion b/‎src/interfaces/odbc/info.c
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/interfaces/odbc/isql.h
Lines changed: 1 addition & 1 deletion b/‎src/interfaces/odbc/isql.h
Lines changed: 1 addition & 1 deletion
@@ -2,7 +2,7 @@
 #
 # GNUMakefile for psqlodbc (Postgres ODBC driver)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.16 2001/05/11 01:46:33 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.17 2001/08/21 05:21:09 inoue Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -21,7 +21,7 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(o
 OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
         environ.o execute.o lobj.o misc.o options.o \
         pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \
-        gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
+        gpps.o tuple.o tuplelist.o dlg_specific.o odbcapi.o $(OBJX)
 
 ifdef MULTIBYTE
 OBJS += multibyte.o
 
@@ -1969,8 +1969,16 @@ convert_from_pgbinary(unsigned char *value, unsigned char *rgbValue, int cbValue
 	{
 		if (value[i] == '\\')
 		{
-			rgbValue[o] = conv_from_octal(&value[i]);
-			i += 4;
+			if (value[i + 1] == '\\')
+			{
+				rgbValue[o] = value[i];
+				i += 2;
+			}
+			else
+			{
+				rgbValue[o] = conv_from_octal(&value[i]);
+				i += 4;
+			}
 		}
 		else
 			rgbValue[o] = value[i++];
 
@@ -682,7 +682,6 @@ PGAPI_GetInfo(
 			break;
 
 		default:
-return PGAPI_GetInfo30(hdbc, fInfoType, rgbInfoValue, cbInfoValueMax,pcbInfoValue);
 			/* unrecognized key */
 			conn->errormsg = "Unrecognized key passed to PGAPI_GetInfo.";
 			conn->errornumber = CONN_NOT_IMPLEMENTED_ERROR;
 
@@ -26,7 +26,7 @@ typedef signed short RETCODE;
 #define SQL_API			 EXPORT CALLBACK
 #endif
 
-#define ODBCVER							0x0250
+/*#define ODBCVER		0x0250 */
 
 #define SQL_MAX_MESSAGE_LENGTH			512
 #define SQL_MAX_DSN_LENGTH				32
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.16 2001/05/11 01:46:33 momjian Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.17 2001/08/21 05:21:09 inoue Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -21,7 +21,7 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(o`
`21`	`21`	`OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \`
`22`	`22`	`environ.o execute.o lobj.o misc.o options.o \`
`23`	`23`	`pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \`
`24`		`- gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)`
	`24`	`+ gpps.o tuple.o tuplelist.o dlg_specific.o odbcapi.o $(OBJX)`
`25`	`25`
`26`	`26`	`ifdef MULTIBYTE`
`27`	`27`	`OBJS += multibyte.o`
Original file line number	Diff line number	Diff line change
`@@ -1969,8 +1969,16 @@ convert_from_pgbinary(unsigned char value, unsigned char rgbValue, int cbValue`
`1969`	`1969`	`{`
`1970`	`1970`	`if (value[i] == '\\')`
`1971`	`1971`	`{`
`1972`		`- rgbValue[o] = conv_from_octal(&value[i]);`
`1973`		`- i += 4;`
	`1972`	`+ if (value[i + 1] == '\\')`
	`1973`	`+ {`
	`1974`	`+ rgbValue[o] = value[i];`
	`1975`	`+ i += 2;`
	`1976`	`+ }`
	`1977`	`+ else`
	`1978`	`+ {`
	`1979`	`+ rgbValue[o] = conv_from_octal(&value[i]);`
	`1980`	`+ i += 4;`
	`1981`	`+ }`
`1974`	`1982`	`}`
`1975`	`1983`	`else`
`1976`	`1984`	`rgbValue[o] = value[i++];`