Remove -k unix socketpath option from client side, allow hostname with

leading slash to behave as a unix socket path.

6 files changed, 7 insertions, 35 deletions

diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index ffe071a665..8fceb26c8e 100644
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -99,9 +99,8 @@ typedef struct _restoreOptions {
 
 	int			useDB;
 	char		*dbname;
-	char		*pghost;
 	char		*pgport;
-	char		*pgunixsocket;
+	char		*pghost;
 	int			ignoreVersion;
 	int			requirePassword;
 
@@ -123,7 +122,6 @@ PGconn* ConnectDatabase(Archive *AH,
 		const char* 	dbname,
 		const char*	pghost,
 		const char*	pgport,
-		const char*	pgunixsocket,
 		const int	reqPwd,
 		const int	ignoreVersion);
 
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 085a2eb329..d8a969b41e 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -131,9 +131,8 @@ void RestoreArchive(Archive* AHX, RestoreOptions *ropt)
 		if (AH->version < K_VERS_1_3)
 			die_horribly(AH, "Direct database connections are not supported in pre-1.3 archives");
 
-		ConnectDatabase(AHX, ropt->dbname, ropt->pghost, ropt->pgport,
-							ropt->pgunixsocket, ropt->requirePassword,
-							ropt->ignoreVersion);
+		ConnectDatabase(AHX, ropt->dbname, ropt->pghost, ropt->pgport, 
+							ropt->requirePassword, ropt->ignoreVersion);
 
 		/*
 		 * If no superuser was specified then see if the current user will do...
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index a938f5e339..2c7291e6c6 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -187,7 +187,6 @@ typedef struct _archiveHandle {
 	char				*archdbname;		/* DB name *read* from archive */
 	char				*pghost;
 	char				*pgport;
-	char				*pgunixsocket;
 	PGconn				*connection;
 	PGconn				*blobConnection;	/* Connection for BLOB xref */
 	int					txActive;			/* Flag set if TX active on connection */
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index 082edd5824..72189eb29f 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -273,7 +273,6 @@ PGconn* ConnectDatabase(Archive *AHX,
 		const char* 	dbname,
 		const char* 	pghost,
 		const char* 	pgport,
-		const char* 	pgunixsocket,
 		const int		reqPwd,
 		const int		ignoreVersion)
 {
@@ -308,15 +307,6 @@ PGconn* ConnectDatabase(Archive *AHX,
 	else
 	    AH->pgport = NULL;
 
-	if (pgunixsocket != NULL)
-	{
-		AH->pgport = strdup(pgunixsocket);
-		sprintf(tmp_string, "unixsocket=%s ", AH->pgunixsocket);
-		strcat(connect_string, tmp_string);
-	}
-	else
-	    AH->pgunixsocket = NULL;
-
 	sprintf(tmp_string, "dbname=%s ", AH->dbname);
 	strcat(connect_string, tmp_string);
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 738425a3eb..a7c1ca9e8a 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.178 2000/11/13 15:18:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.179 2000/11/13 23:37:52 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -200,7 +200,6 @@ help(const char *progname)
 		"  -F, --format {c|f|p}     output file format (custom, files, plain text)\n"
 		"  -h, --host <hostname>    server host name\n"
 		"  -i, --ignore-version     proceed when database version != pg_dump version\n"
-		"  -k, --unixsocket <path>  server Unix-domain socket name\n"
 		"  -n, --no-quotes          suppress most quotes around identifiers\n"
 		"  -N, --quotes             enable most quotes around identifiers\n"
 		"  -o, --oids               dump object ids (oids)\n"
@@ -227,7 +226,6 @@ help(const char *progname)
 		"  -F {c|f|p}               output file format (custom, files, plain text)\n"
 		"  -h <hostname>            server host name\n"
 		"  -i                       proceed when database version != pg_dump version\n"
-		"  -k <path>                server Unix-domain socket name\n"
 		"  -n                       suppress most quotes around identifiers\n"
 		"  -N                       enable most quotes around identifiers\n"
 		"  -o                       dump object ids (oids)\n"
@@ -631,7 +629,6 @@ main(int argc, char **argv)
 	const char *dbname = NULL;
 	const char *pghost = NULL;
 	const char *pgport = NULL;
-	const char *pgunixsocket = NULL;
 	char	   *tablename = NULL;
 	bool		oids = false;
 	TableInfo  *tblinfo;
@@ -661,7 +658,6 @@ main(int argc, char **argv)
 		{"attribute-inserts", no_argument, NULL, 'D'},
 		{"host", required_argument, NULL, 'h'},
 		{"ignore-version", no_argument, NULL, 'i'},
-		{"unixsocket", required_argument, NULL, 'k'},
 		{"no-reconnect", no_argument, NULL, 'R'},
 		{"no-quotes", no_argument, NULL, 'n'},
 		{"quotes", no_argument, NULL, 'N'},
@@ -756,10 +752,6 @@ main(int argc, char **argv)
 				ignore_version = true;
 				break;
 
-			case 'k':			/* server Unix-domain socket */
-				pgunixsocket = optarg;
-				break;
-
 			case 'n':			/* Do not force double-quotes on
 								 * identifiers */
 				force_quotes = false;
@@ -956,8 +948,7 @@ main(int argc, char **argv)
 	dbname = argv[optind];
 
 	/* Open the database using the Archiver, so it knows about it. Errors mean death */
-	g_conn = ConnectDatabase(g_fout, dbname, pghost, pgport, pgunixsocket,
-							 use_password, ignore_version);
+	g_conn = ConnectDatabase(g_fout, dbname, pghost, pgport, use_password, ignore_version);
 
 	/*
 	 * Start serializable transaction to dump consistent data
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index cafb7e9df6..458482ed51 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -101,7 +101,6 @@ struct option cmdopts[] = {
 				{ "ignore-version", 0, NULL, 'i'},
 				{ "index", 2, NULL, 'I'},
 				{ "list", 0, NULL, 'l'},
-				{ "unixsocket", 1, NULL, 'k' },
 				{ "no-acl", 0, NULL, 'x' },
 				{ "no-owner", 0, NULL, 'O'},
 				{ "no-reconnect", 0, NULL, 'R' },
@@ -133,9 +132,9 @@ int main(int argc, char **argv)
 	progname = *argv;
 
 #ifdef HAVE_GETOPT_LONG
-	while ((c = getopt_long(argc, argv, "acCd:f:F:h:i:k:lNoOp:P:rRsS:t:T:uU:vx", cmdopts, NULL)) != EOF)
+	while ((c = getopt_long(argc, argv, "acCd:f:F:h:i:lNoOp:P:rRsS:t:T:uU:vx", cmdopts, NULL)) != EOF)
 #else
-	while ((c = getopt(argc, argv, "acCd:f:F:h:i:k:lNoOp:P:rRsS:t:T:uU:vx")) != -1)
+	while ((c = getopt(argc, argv, "acCd:f:F:h:i:lNoOp:P:rRsS:t:T:uU:vx")) != -1)
 #endif
 	{
 		switch (c)
@@ -171,10 +170,6 @@ int main(int argc, char **argv)
 			case 'i':
 				opts->ignoreVersion = 1;
 				break;
-			case 'k':
-				if (strlen(optarg) != 0)
-					opts->pgunixsocket = strdup(optarg);
-				break;
 			case 'N':
 				opts->origOrder = 1;
 				break;