Commit0725065

committed

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

if you have previously issued a \cd command.Greg Sabino Mullane

1 parent51746c4 commit0725065Copy full SHA for 0725065

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.144 2005/06/0915:27:26 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.145 2005/06/0923:28:09 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"command.h"`
`@@ -276,6 +276,11 @@ exec_command(const char *cmd,`
`276`	`276`	`success= false;`
`277`	`277`	`}`
`278`	`278`
	`279`	`+if (pset.dirname)`
	`280`	`+pfree(pset.dirname);`
	`281`	`+pset.dirname=pg_strdup(dir);`
	`282`	`+canonicalize_path(pset.dirname);`
	`283`	`+`
`279`	`284`	`if (opt)`
`280`	`285`	`free(opt);`
`281`	`286`	`}`
`@@ -661,7 +666,8 @@ exec_command(const char *cmd,`
`661`	`666`	`success=saveHistory(fname ?fname :"/dev/tty");`
`662`	`667`
`663`	`668`	`if (success&& !quiet&&fname)`
`664`		`-printf(_("Wrote history to file \"%s\".\n"),fname);`
	`669`	`+printf(gettext("Wrote history to file \"%s/%s\".\n"),`
	`670`	`+pset.dirname ?pset.dirname :".",fname);`
`665`	`671`	`if (!fname)`
`666`	`672`	`putchar('\n');`
`667`	`673`	`free(fname);`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.23 2005/01/01 05:43:08 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.24 2005/06/09 23:28:10 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#ifndefSETTINGS_H`
`9`	`9`	`#defineSETTINGS_H`
`@@ -49,6 +49,8 @@ typedef struct _psqlSettings`
`49`	`49`	`intsversion;/* backend server version */`
`50`	`50`	`constcharprogname;/ in case you renamed psql */`
`51`	`51`	`charinputfile;/ for error reporting */`
	`52`	`+chardirname;/ current directory for \s display */`
	`53`	`+`
`52`	`54`	`unsignedlineno;/* also for error reporting */`
`53`	`55`
`54`	`56`	`booltiming;/* enable timing of all queries */`

Comments

(0)