c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source 
default on Win32.
This commit is contained in:
Bruce Momjian 2004-11-06 04:29:40 +00:00
parent d2f6c3e56c
commit 7ba377431e
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/bin/psql/command.c
View file

@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.130 2004/11/04 22:25:14 momjian Exp $
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.131 2004/11/06 04:29:40 momjian Exp $
*/
#include "postgres_fe.h"
#include "command.h"
@ -1525,7 +1525,11 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
#ifndef WIN32
#define DEFAULT_SHELL "/bin/sh"
#else
#define DEFAULT_SHELL "c:/windows/system32/cmd.exe"
#endif
static bool
do_shell(const char *command)
@ -1537,11 +1541,11 @@ do_shell(const char *command)
char *sys;
const char *shellName = NULL;
shellName = getenv("SHELL");
#ifdef WIN32
shellName = getenv("COMSPEC");
#endif
if (shellName == NULL)
shellName = getenv("SHELL");
shellName = getenv("COMSPEC");
#endif
if (shellName == NULL)
shellName = DEFAULT_SHELL;