Commit3e8dbc8

committed

Support only octal for psql PROMPT values, rather than the confusing

hex/decimal/octal. Documentation already updated.BACKWARD COMPATIBLE CHANGE

1 parent33294d5 commit3e8dbc8Copy full SHA for 3e8dbc8

File tree

-24

lines changed

-24

lines changed

Lines changed: 1 addition & 12 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/common.c,v 1.97 2005/04/28 13:09:59 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.98 2005/05/30 18:28:11 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"common.h"`
`@@ -1237,17 +1237,6 @@ command_no_begin(const char *query)`
`1237`	`1237`	`}`
`1238`	`1238`
`1239`	`1239`
`1240`		`-char`
`1241`		`-parse_char(char**buf)`
`1242`		`-{`
`1243`		`-longl;`
`1244`		`-`
`1245`		`-l=strtol(*buf,buf,0);`
`1246`		`---*buf;`
`1247`		`-return (char)l;`
`1248`		`-}`
`1249`		`-`
`1250`		`-`
`1251`	`1240`	`/*`
`1252`	`1241`	`* Test if the current user is a database superuser.`
`1253`	`1242`	`*`

Lines changed: 1 addition & 7 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/common.h,v 1.42 2005/01/01 05:43:08 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/common.h,v 1.43 2005/05/30 18:28:11 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#ifndefCOMMON_H`
`9`	`9`	`#defineCOMMON_H`
`@@ -60,12 +60,6 @@ extern bool SendQuery(const char *query);`
`60`	`60`	`externboolis_superuser(void);`
`61`	`61`	`externconstchar*session_username(void);`
`62`	`62`
`63`		`-/* Parse a numeric character code from the string pointed at by *buf, e.g.`
`64`		`- * one written as 0x0c (hexadecimal) or 015 (octal); advance *buf to the last`
`65`		`- * character of the numeric character code.`
`66`		`- */`
`67`		`-externcharparse_char(char**buf);`
`68`		`-`
`69`	`63`	`externcharexpand_tilde(char*filename);`
`70`	`64`
`71`	`65`	`#endif/* COMMON_H */`

Lines changed: 3 additions & 5 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/prompt.c,v 1.38 2005/01/01 05:43:08 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/prompt.c,v 1.39 2005/05/30 18:28:11 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"prompt.h"`
`@@ -175,11 +175,9 @@ get_prompt(promptStatus_t status)`
`175`	`175`	`case'5':`
`176`	`176`	`case'6':`
`177`	`177`	`case'7':`
`178`		`-case'8':`
`179`		`-case'9':`
`180`		`-buf=parse_char((char*)&p);`
	`178`	`+buf= (char)strtol(p, (char*)&p,8);`
	`179`	`+--p;`
`181`	`180`	`break;`
`182`		`-`
`183`	`181`	`case'R':`
`184`	`182`	`switch (status)`
`185`	`183`	`{`

Comments

(0)