database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

This patch shows the full path name when doing a \s in psql,

Browse Source 
if you have previously issued a \cd command.

Greg Sabino Mullane
This commit is contained in:
Bruce Momjian 2005-06-09 23:28:10 +00:00
parent 51746c4549
commit 0725065b37
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/psql/command.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2005, PostgreSQL Global Development Group * Copyright (c) 2000-2005, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.144 2005/06/09 15:27:26 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.145 2005/06/09 23:28:09 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "command.h" #include "command.h"
@ -276,6 +276,11 @@ exec_command(const char *cmd,
success = false; success = false;
} }
if (pset.dirname)
pfree(pset.dirname);
pset.dirname = pg_strdup(dir);
canonicalize_path(pset.dirname);
if (opt) if (opt)
free(opt); free(opt);
} }
@ -661,7 +666,8 @@ exec_command(const char *cmd,
success = saveHistory(fname ? fname : "/dev/tty"); success = saveHistory(fname ? fname : "/dev/tty");
if (success && !quiet && fname) if (success && !quiet && fname)
printf(_("Wrote history to file \"%s\".\n"), fname); printf(gettext("Wrote history to file \"%s/%s\".\n"),
pset.dirname ? pset.dirname : ".", fname);
if (!fname) if (!fname)
putchar('\n'); putchar('\n');
free(fname); free(fname);

4
src/bin/psql/settings.h
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2005, PostgreSQL Global Development Group * Copyright (c) 2000-2005, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.23 2005/01/01 05:43:08 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.24 2005/06/09 23:28:10 momjian Exp $
*/ */
#ifndef SETTINGS_H #ifndef SETTINGS_H
#define SETTINGS_H #define SETTINGS_H
@ -49,6 +49,8 @@ typedef struct _psqlSettings
int sversion; /* backend server version */ int sversion; /* backend server version */
const char *progname; /* in case you renamed psql */ const char *progname; /* in case you renamed psql */
char *inputfile; /* for error reporting */ char *inputfile; /* for error reporting */
char *dirname; /* current directory for \s display */
unsigned lineno; /* also for error reporting */ unsigned lineno; /* also for error reporting */
bool timing; /* enable timing of all queries */ bool timing; /* enable timing of all queries */