Add Win32 path handling for / vs. \ and drive letters.

9 files changed, 16 insertions, 48 deletions

diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 7c99bbb10c..15c5000e10 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -6,7 +6,7 @@
  * copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
  * licence: BSD
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.8 2003/01/08 22:26:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.9 2003/04/04 20:42:12 momjian Exp $
  */
 #include "postgres.h"
 
@@ -82,10 +82,7 @@ main(int argc, char *argv[])
 	textdomain("pg_controldata");
 #endif
 
-	if (!strrchr(argv[0], '/'))
-		progname = argv[0];
-	else
-		progname = strrchr(argv[0], '/') + 1;
+	progname = get_progname(argv[0]);
 
 	if (argc > 1)
 	{
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 1c6dfe2469..409a961701 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  *	by PostgreSQL
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.325 2003/03/31 20:48:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.326 2003/04/04 20:42:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -244,10 +244,7 @@ main(int argc, char **argv)
 
 	dataOnly = schemaOnly = dumpData = attrNames = false;
 
-	if (!strrchr(argv[0], '/'))
-		progname = argv[0];
-	else
-		progname = strrchr(argv[0], '/') + 1;
+	progname = get_progname(argv[0]);
 
 	/* Set default options based on progname */
 	if (strcmp(progname, "pg_backup") == 0)
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 52facb459a..f3919048f8 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.16 2003/03/14 22:45:49 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.17 2003/04/04 20:42:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -100,10 +100,7 @@ main(int argc, char *argv[])
 	textdomain("pg_dump");
 #endif
 
-	if (!strrchr(argv[0], '/'))
-		progname = argv[0];
-	else
-		progname = strrchr(argv[0], '/') + 1;
+	progname = get_progname(argv[0]);
 
 	if (argc > 1)
 	{
@@ -730,7 +727,7 @@ findPgDump(const char *argv0)
 		return result;
 
 	cmd = createPQExpBuffer();
-	last = strrchr(argv0, '/');
+	last = last_path_separator(argv0);
 
 	if (!last)
 		appendPQExpBuffer(cmd, "pg_dump");
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index fe1471ff99..8e7cea0209 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.44 2003/01/06 18:53:25 petere Exp $
+ *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.45 2003/04/04 20:42:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -137,10 +137,7 @@ main(int argc, char **argv)
 
 	opts = NewRestoreOptions();
 
-	if (!strrchr(argv[0], '/'))
-		progname = argv[0];
-	else
-		progname = strrchr(argv[0], '/') + 1;
+	progname = get_progname(argv[0]);
 
 	if (argc > 1)
 	{
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index ee6a3b5173..b07cfd09e2 100644
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.8 2002/10/18 22:05:36 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.9 2003/04/04 20:42:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -105,10 +105,7 @@ main(int argc, char *argv[])
 	textdomain("pg_resetxlog");
 #endif
 
-	if (!strrchr(argv[0], '/'))
-		progname = argv[0];
-	else
-		progname = strrchr(argv[0], '/') + 1;
+	progname = get_progname(argv[0]);
 
 	if (argc > 1)
 	{
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index c65da457db..f9d66b752e 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.24 2003/03/20 15:39:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.25 2003/04/04 20:42:13 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "prompt.h"
@@ -130,7 +130,7 @@ get_prompt(promptStatus_t status)
 						const char *host = PQhost(pset.db);
 
 						/* INET socket */
-						if (host && host[0] && host[0] != '/')
+						if (host && host[0] && !is_absolute_path(host))
 						{
 							strncpy(buf, host, MAX_PROMPT_SIZE);
 							if (*p == 'm')
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 47e17e3535..74d79fc507 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.72 2003/03/20 06:43:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.73 2003/04/04 20:42:13 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -110,10 +110,7 @@ main(int argc, char *argv[])
 	textdomain("psql");
 #endif
 
-	if (!strrchr(argv[0], '/'))
-		pset.progname = argv[0];
-	else
-		pset.progname = strrchr(argv[0], '/') + 1;
+	pset.progname = get_progname(argv[0]);
 
 	if (argc > 1)
 	{
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
index a04cf19555..a1a6993e72 100644
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/bin/scripts/common.c,v 1.1 2003/03/18 22:19:46 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/common.c,v 1.2 2003/04/04 20:42:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,19 +36,6 @@ get_user_name(const char *progname)
 
 
 /*
- * Extracts the actual name of the program as called.
- */
-char *
-get_progname(char *argv0)
-{
-	if (!strrchr(argv0, '/'))
-		return argv0;
-	else
-		return strrchr(argv0, '/') + 1;
-}
-
-
-/*
  * Initialized NLS if enabled.
  */
 void
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index 52e7b0c3fc..6122b686ce 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -16,7 +16,6 @@ int optreset;
 #endif
 
 const char *get_user_name(const char *progname);
-char *get_progname(char *argv0);
 
 #define _(x) gettext((x))
 void init_nls(void);