7 files changed, 17 insertions, 88 deletions
diff --git a/src/interfaces/libpgeasy/examples/Makefile b/src/interfaces/libpgeasy/examples/Makefile
index db88f1b9ebc..1885bb425fb 100644
--- a/src/interfaces/libpgeasy/examples/Makefile
+++ b/src/interfaces/libpgeasy/examples/Makefile
@@ -4,12 +4,13 @@
 #    Makefile for pgeasy examples
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/examples/Attic/Makefile,v 1.1 1999/10/11 18:03:01 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/examples/Attic/Makefile,v 1.2 2000/05/18 14:24:37 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
+CFLAGS=-I/usr/local/pgsql/include
 TARGET = pginsert pgwordcount pgnulltest
-LDFLAGS = -lpgeasy
+LDFLAGS = -L/usr/local/pgsql/lib -lpgeasy
 
 all : $(TARGET)
 
diff --git a/src/interfaces/libpgeasy/examples/pginsert.c b/src/interfaces/libpgeasy/examples/pginsert.c
index 933d0ab1829..eac150109e1 100644
--- a/src/interfaces/libpgeasy/examples/pginsert.c
+++ b/src/interfaces/libpgeasy/examples/pginsert.c
@@ -23,11 +23,13 @@ main(int argc, char **argv)
 				avarchar[51],
 				atext[51];
 	time_t		aabstime;
+	char	    optstr[256];
 
 	if (argc != 2)
 		halt("Usage:  %s database\n", argv[0]);
 
-	connectdb(NULL, NULL, NULL, NULL, argv[1]);
+	snprintf(optstr, 256, "dbname=%s", argv[1]);
+	connectdb(optstr);
 
 	on_error_continue();
 	doquery("DROP TABLE testfetch");
diff --git a/src/interfaces/libpgeasy/examples/pgnulltest.c b/src/interfaces/libpgeasy/examples/pgnulltest.c
index 7fd8c7f9e27..9489a9d2912 100644
--- a/src/interfaces/libpgeasy/examples/pgnulltest.c
+++ b/src/interfaces/libpgeasy/examples/pgnulltest.c
@@ -34,11 +34,13 @@ main(int argc, char **argv)
 				avarchar_null,
 				atext_null,
 				aabstime_null;
+	char	    optstr[256];
 
 	if (argc != 2)
 		halt("Usage:  %s database\n", argv[0]);
 
-	connectdb(NULL, NULL, NULL, NULL, argv[1]);
+	snprintf(optstr, 256, "dbname=%s", argv[1]);
+	connectdb(optstr);
 
 	on_error_continue();
 	doquery("DROP TABLE testfetch");
diff --git a/src/interfaces/libpgeasy/examples/pgwordcount.c b/src/interfaces/libpgeasy/examples/pgwordcount.c
index df8d5b9d0c2..d87349e95bd 100644
--- a/src/interfaces/libpgeasy/examples/pgwordcount.c
+++ b/src/interfaces/libpgeasy/examples/pgwordcount.c
@@ -15,11 +15,14 @@ main(int argc, char **argv)
 	int			row = 0;
 	int			count;
 	char		line[4000];
+	char	    optstr[256];
 
 	if (argc != 2)
 		halt("Usage:  %s database\n", argv[0]);
 
-	connectdb(NULL, NULL, NULL, NULL, argv[1]);
+	snprintf(optstr, 256, "dbname=%s", argv[1]);
+	connectdb(optstr);
+
 	on_error_continue();
 	doquery("DROP TABLE words");
 	on_error_stop();
diff --git a/src/interfaces/libpgeasy/libpgeasy.3 b/src/interfaces/libpgeasy/libpgeasy.3
deleted file mode 100644
index e90da0e7900..00000000000
--- a/src/interfaces/libpgeasy/libpgeasy.3
+++ /dev/null
@@ -1,71 +0,0 @@
-.\" This is -*-nroff-*-
-.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/libpgeasy.3,v 1.1 1999/10/12 14:06:49 momjian Exp $
-.TH PGEASY INTRO 08/08/98 PostgreSQL PostgreSQL
-.SH DESCRIPTION
-Pgeasy allows you to cleanly interface to the libpq library,
-more like a 4gl SQL interface.
-.PP
-It consists of set of simplified C functions that encapsulate the
-functionality of libpq.
-The functions are:
-
-.nf
-PGresult   *doquery(char *query);
-PGconn     *connectdb();
-void        disconnectdb();
-
-int         fetch(void *param,...);
-int         fetchwithnulls(void *param,...);
-void        reset_fetch();
-
-void        on_error_continue();
-void        on_error_stop();
-
-PGresult   *get_result();
-void        set_result(PGresult *newres);
-void        unset_result(PGresult *oldres);
-.fi
-.PP
-Many functions return a structure or value, so you can do more work
-with the result if required.  
-.PP
-You basically connect to the database with
-.BR connectdb ,
-issue your query with
-.BR doquery ,
-fetch the results with
-.BR fetch ,
-and finish with
-.BR disconnectdb .
-.PP
-For
-.IR select
-queries,
-.BR fetch 
-allows you to pass pointers as parameters, and on return the variables
-are filled with data from the binary cursor you opened.  These binary
-cursors can not be used if you are running the
-.BR pgeasy
-client on a system with a different architecture than the database
-server.  If you pass a NULL pointer parameter, the column is skipped.
-.BR fetchwithnulls
-allows you to retieve the
-.IR null
-status of the field by passing an
-.IR int*
-after each result pointer, which returns true or false if the field is null.
-You can always use libpq functions on the PGresult pointer returned by
-.BR doquery .
-.BR reset_fetch
-starts the fetch back at the beginning.
-.PP
-.BR get_result ,
-.BR set_result ,
-and
-.BR unset_result
-allow you to handle multiple result sets at the same time.
-.PP
-There are a variety of demonstration programs in the
-.BR pgeasy
-source directory.
diff --git a/src/interfaces/libpgeasy/libpgeasy.c b/src/interfaces/libpgeasy/libpgeasy.c
index 19b6d84167c..f78a00cf648 100644
--- a/src/interfaces/libpgeasy/libpgeasy.c
+++ b/src/interfaces/libpgeasy/libpgeasy.c
@@ -44,16 +44,12 @@ static int	tuple;
 **
 */
 PGconn *
-connectdb(char *pghost,
-		  char *pgport,
-		  char *pgoptions,
-		  char *pgtty,
-		  char *dbName)
+connectdb(char *options)
 {
 	/* make a connection to the database */
-	conn = PQsetdb(pghost, pgport, pgoptions, pgtty, dbName);
+	conn = PQconnectdb(options);
 	if (PQstatus(conn) == CONNECTION_BAD)
-		halt("Connection to database '%s' failed.\n%s\n", dbName,
+		halt("Connection to database using '%s' failed.\n%s\n", options,
 			 PQerrorMessage(conn));
 	return conn;
 }
diff --git a/src/interfaces/libpgeasy/libpgeasy.h b/src/interfaces/libpgeasy/libpgeasy.h
index 3686b4e9263..5ca12c80122 100644
--- a/src/interfaces/libpgeasy/libpgeasy.h
+++ b/src/interfaces/libpgeasy/libpgeasy.h
@@ -4,11 +4,7 @@
 */
 
 PGresult   *doquery(char *query);
-PGconn *connectdb(char *pghost,
-		  char *pgport,
-		  char *pgoptions,
-		  char *pgtty,
-		  char *dbName);
+PGconn 	   *connectdb(char *options);
 void		disconnectdb(void);
 int			fetch(void *param,...);
 int			fetchwithnulls(void *param,...);