mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change Win32 client configuration files from *.txt to *.conf.

Browse Source
This commit is contained in:
Bruce Momjian 2005-01-14 00:25:56 +00:00
parent 2730eb9ae4
commit 29e58330a6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/sgml/libpq.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.177 2005/01/08 22:13:28 tgl Exp $ $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.178 2005/01/14 00:23:21 momjian Exp $
--> -->
<chapter id="libpq"> <chapter id="libpq">
@ -3883,7 +3883,7 @@ The file <filename>.pgpass</filename> in a user's home directory is a file
that can contain passwords to be used if the connection requires a that can contain passwords to be used if the connection requires a
password (and no password has been specified otherwise). password (and no password has been specified otherwise).
On Microsoft Windows the file is named On Microsoft Windows the file is named
<filename>%APPDATA%\postgresql\pgpass.txt</> (where <filename>%APPDATA%</> <filename>%APPDATA%\postgresql\pgpass.conf</> (where <filename>%APPDATA%</>
refers to the Application Data subdirectory in the user's profile). refers to the Application Data subdirectory in the user's profile).
</para> </para>

4
doc/src/sgml/ref/psql-ref.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.129 2005/01/06 21:20:44 tgl Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.130 2005/01/14 00:24:23 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -2525,7 +2525,7 @@ $endif
<filename>psqlrc</filename> file and the user's <filename>psqlrc</filename> file and the user's
<filename>~/.psqlrc</filename> file. <filename>~/.psqlrc</filename> file.
(On Windows, the user's startup file is named (On Windows, the user's startup file is named
<filename>%APPDATA%\postgresql\psqlrc.txt</filename>.) <filename>%APPDATA%\postgresql\psqlrc.conf</filename>.)
See <filename><replaceable>PREFIX</>/share/psqlrc.sample</> See <filename><replaceable>PREFIX</>/share/psqlrc.sample</>
for information on setting up the system-wide file. It could be used for information on setting up the system-wide file. It could be used
to set up the client or the server to taste (using the <command>\set to set up the client or the server to taste (using the <command>\set

4
src/bin/psql/startup.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/startup.c,v 1.109 2005/01/06 18:29:09 tgl Exp $ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.110 2005/01/14 00:25:17 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -48,7 +48,7 @@ PsqlSettings pset;
#define PSQLRC ".psqlrc" #define PSQLRC ".psqlrc"
#else #else
#define SYSPSQLRC "psqlrc" #define SYSPSQLRC "psqlrc"
#define PSQLRC "psqlrc.txt" #define PSQLRC "psqlrc.conf"
#endif #endif
/* /*

4
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.300 2005/01/10 00:19:43 tgl Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.301 2005/01/14 00:25:56 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -69,7 +69,7 @@
#ifndef WIN32 #ifndef WIN32
#define PGPASSFILE ".pgpass" #define PGPASSFILE ".pgpass"
#else #else
#define PGPASSFILE "pgpass.txt" #define PGPASSFILE "pgpass.conf"
#endif #endif
/* fall back options if they are not specified by arguments or defined /* fall back options if they are not specified by arguments or defined