diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-04-04 20:42:13 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-04-04 20:42:13 +0000 |
| commit | d46e6438225d8741100dc400a4a63c87799f0945 (patch) | |
| tree | c20b838ead99ca2558a188b84595115538c02dd2 /src/bin/psql | |
| parent | 9bad936f67cb7561d0d232ca365e23fe73219a1a (diff) | |
| download | postgresql-d46e6438225d8741100dc400a4a63c87799f0945.tar.gz postgresql-d46e6438225d8741100dc400a4a63c87799f0945.zip | |
Add Win32 path handling for / vs. \ and drive letters.
Diffstat (limited to 'src/bin/psql')
| -rw-r--r-- | src/bin/psql/prompt.c | 4 | ||||
| -rw-r--r-- | src/bin/psql/startup.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c index c65da457db8..f9d66b752ec 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 47e17e3535f..74d79fc5078 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) { |