Commit7ba3774

committed

Tests for COMSPEC in the right place and supply a reasonable shell

default on Win32.

1 parentd2f6c3e commit7ba3774Copy full SHA for 7ba3774

File tree

-4

lines changed

-4

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2004, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.130 2004/11/04 22:25:14 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.131 2004/11/06 04:29:40 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"command.h"`
`@@ -1525,7 +1525,11 @@ do_pset(const char param, const char value, printQueryOpt *popt, bool quiet)`
`1525`	`1525`
`1526`	`1526`
`1527`	`1527`
	`1528`	`+#ifndefWIN32`
`1528`	`1529`	`#defineDEFAULT_SHELL "/bin/sh"`
	`1530`	`+#else`
	`1531`	`+#defineDEFAULT_SHELL "c:/windows/system32/cmd.exe"`
	`1532`	`+#endif`
`1529`	`1533`
`1530`	`1534`	`staticbool`
`1531`	`1535`	`do_shell(constchar*command)`
`@@ -1537,11 +1541,11 @@ do_shell(const char *command)`
`1537`	`1541`	`char*sys;`
`1538`	`1542`	`constchar*shellName=NULL;`
`1539`	`1543`
	`1544`	`+shellName=getenv("SHELL");`
`1540`	`1545`	`#ifdefWIN32`
`1541`		`-shellName=getenv("COMSPEC");`
`1542`		`-#endif`
`1543`	`1546`	`if (shellName==NULL)`
`1544`		`-shellName=getenv("SHELL");`
	`1547`	`+shellName=getenv("COMSPEC");`
	`1548`	`+#endif`
`1545`	`1549`	`if (shellName==NULL)`
`1546`	`1550`	`shellName=DEFAULT_SHELL;`
`1547`	`1551`

Comments

(0)