Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcd8b0fc

Browse files
committed
Change PGETC to PGSYSCONFDIR and PGLOCALE to PGLOCALEDIR, per Peter.
1 parentb2a1703 commitcd8b0fc

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

‎doc/src/sgml/libpq.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.156 2004/06/03 00:07:35 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.157 2004/06/08 13:49:22 momjian Exp $
33
-->
44

55
<chapter id="libpq">
@@ -3585,18 +3585,18 @@ sets the default mode for the genetic query optimizer.
35853585
<listitem>
35863586
<para>
35873587
<indexterm>
3588-
<primary><envar>PGETC</envar></primary>
3588+
<primary><envar>PGSYSCONFDIR</envar></primary>
35893589
</indexterm>
3590-
<envar>PGETC</envar>
3590+
<envar>PGSYSCONFDIR</envar>
35913591
sets the directory containing the <filename>pg_service.conf</> file.
35923592
</para>
35933593
</listitem>
35943594
<listitem>
35953595
<para>
35963596
<indexterm>
3597-
<primary><envar>PGLOCALE</envar></primary>
3597+
<primary><envar>PGLOCALEDIR</envar></primary>
35983598
</indexterm>
3599-
<envar>PGLOCALE</envar>
3599+
<envar>PGLOCALEDIR</envar>
36003600
sets the directory containing the <literal>locale</> files.
36013601
</para>
36023602
</listitem>

‎src/interfaces/libpq/fe-connect.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.272 2004/06/03 00:07:38 momjian Exp $
11+
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.273 2004/06/08 13:49:23 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -2387,7 +2387,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
23872387
*location to find our config files.
23882388
*/
23892389
snprintf(serviceFile,MAXPGPATH,"%s/pg_service.conf",
2390-
getenv("PGETC") ?getenv("PGETC") :SYSCONFDIR);
2390+
getenv("PGSYSCONFDIR") ?getenv("PGSYSCONFDIR") :SYSCONFDIR);
23912391

23922392
if (service!=NULL)
23932393
{

‎src/interfaces/libpq/fe-misc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Portions Copyright (c) 1994, Regents of the University of California
2424
*
2525
* IDENTIFICATION
26-
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.107 2004/06/03 00:07:38 momjian Exp $
26+
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.108 2004/06/08 13:49:23 momjian Exp $
2727
*
2828
*-------------------------------------------------------------------------
2929
*/
@@ -1132,7 +1132,7 @@ libpq_gettext(const char *msgid)
11321132
{
11331133
already_bound=1;
11341134
/* No relocatable lookup here because the binary could be anywhere */
1135-
bindtextdomain("libpq",getenv("PGLOCALE") ?getenv("PGLOCALE") :LOCALEDIR);
1135+
bindtextdomain("libpq",getenv("PGLOCALEDIR") ?getenv("PGLOCALEDIR") :LOCALEDIR);
11361136
}
11371137

11381138
returndgettext("libpq",msgid);

‎src/port/path.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/port/path.c,v 1.17 2004/06/03 00:07:38 momjian Exp $
11+
* $PostgreSQL: pgsql/src/port/path.c,v 1.18 2004/06/08 13:49:23 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -233,7 +233,7 @@ set_pglocale_pgservice(const char *argv0, const char *app)
233233
{
234234
charpath[MAXPGPATH];
235235
charmy_exec_path[MAXPGPATH];
236-
charenv_path[MAXPGPATH+strlen("PGLOCALE=")];/* longer thanPGETC */
236+
charenv_path[MAXPGPATH+strlen("PGLOCALEDIR=")];/* longer thanPGSYSCONFDIR */
237237

238238
/* don't set LC_ALL in the backend */
239239
if (strcmp(app,"postgres")!=0)
@@ -247,20 +247,20 @@ set_pglocale_pgservice(const char *argv0, const char *app)
247247
bindtextdomain(app,path);
248248
textdomain(app);
249249

250-
if (!getenv("PGLOCALE"))
250+
if (!getenv("PGLOCALEDIR"))
251251
{
252252
/* set for libpq to use */
253-
sprintf(env_path,"PGLOCALE=%s",path);
253+
sprintf(env_path,"PGLOCALEDIR=%s",path);
254254
putenv(env_path);
255255
}
256256
#endif
257257

258-
if (!getenv("PGETC"))
258+
if (!getenv("PGSYSCONFDIR"))
259259
{
260260
get_etc_path(my_exec_path,path);
261261

262262
/* set for libpq to use */
263-
sprintf(env_path,"PGETC=%s",path);
263+
sprintf(env_path,"PGSYSCONFDIR=%s",path);
264264
putenv(env_path);
265265
}
266266
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp