10
10
* Written by Peter Eisentraut <peter_e@gmx.net>.
11
11
*
12
12
* IDENTIFICATION
13
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.262 2005/05/15 00:26:19 momjian Exp $
13
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.263 2005/05/27 18:33:30 momjian Exp $
14
14
*
15
15
*--------------------------------------------------------------------
16
16
*/
@@ -2500,20 +2500,20 @@ SelectConfigFiles(const char *userDoption, const char *progname)
2500
2500
*/
2501
2501
if (ConfigFileName )
2502
2502
fname = make_absolute_path (ConfigFileName );
2503
- else if (!configdir )
2503
+ else if (configdir )
2504
+ {
2505
+ fname = guc_malloc (FATAL ,
2506
+ strlen (configdir ) + strlen (CONFIG_FILENAME ) + 2 );
2507
+ sprintf (fname , "%s/%s" , configdir , CONFIG_FILENAME );
2508
+ }
2509
+ else
2504
2510
{
2505
2511
write_stderr ("%s does not know where to find the server configuration file.\n"
2506
2512
"You must specify the --config-file or -D invocation "
2507
2513
"option or set the PGDATA environment variable.\n" ,
2508
2514
progname );
2509
2515
return false;
2510
2516
}
2511
- else
2512
- {
2513
- fname = guc_malloc (FATAL ,
2514
- strlen (configdir ) + strlen (CONFIG_FILENAME ) + 2 );
2515
- sprintf (fname , "%s/%s" , configdir , CONFIG_FILENAME );
2516
- }
2517
2517
2518
2518
/*
2519
2519
* Set the ConfigFileName GUC variable to its final value, ensuring
@@ -2568,7 +2568,13 @@ SelectConfigFiles(const char *userDoption, const char *progname)
2568
2568
*/
2569
2569
if (HbaFileName )
2570
2570
fname = make_absolute_path (HbaFileName );
2571
- else if (!configdir )
2571
+ else if (configdir )
2572
+ {
2573
+ fname = guc_malloc (FATAL ,
2574
+ strlen (configdir ) + strlen (HBA_FILENAME ) + 2 );
2575
+ sprintf (fname , "%s/%s" , configdir , HBA_FILENAME );
2576
+ }
2577
+ else
2572
2578
{
2573
2579
write_stderr ("%s does not know where to find the \"hba\" configuration file.\n"
2574
2580
"This can be specified as \"hba_file\" in \"%s\", "
@@ -2577,12 +2583,6 @@ SelectConfigFiles(const char *userDoption, const char *progname)
2577
2583
progname , ConfigFileName );
2578
2584
return false;
2579
2585
}
2580
- else
2581
- {
2582
- fname = guc_malloc (FATAL ,
2583
- strlen (configdir ) + strlen (HBA_FILENAME ) + 2 );
2584
- sprintf (fname , "%s/%s" , configdir , HBA_FILENAME );
2585
- }
2586
2586
SetConfigOption ("hba_file" , fname , PGC_POSTMASTER , PGC_S_OVERRIDE );
2587
2587
free (fname );
2588
2588
@@ -2591,7 +2591,13 @@ SelectConfigFiles(const char *userDoption, const char *progname)
2591
2591
*/
2592
2592
if (IdentFileName )
2593
2593
fname = make_absolute_path (IdentFileName );
2594
- else if (!configdir )
2594
+ else if (configdir )
2595
+ {
2596
+ fname = guc_malloc (FATAL ,
2597
+ strlen (configdir ) + strlen (IDENT_FILENAME ) + 2 );
2598
+ sprintf (fname , "%s/%s" , configdir , IDENT_FILENAME );
2599
+ }
2600
+ else
2595
2601
{
2596
2602
write_stderr ("%s does not know where to find the \"ident\" configuration file.\n"
2597
2603
"This can be specified as \"ident_file\" in \"%s\", "
@@ -2600,12 +2606,6 @@ SelectConfigFiles(const char *userDoption, const char *progname)
2600
2606
progname , ConfigFileName );
2601
2607
return false;
2602
2608
}
2603
- else
2604
- {
2605
- fname = guc_malloc (FATAL ,
2606
- strlen (configdir ) + strlen (IDENT_FILENAME ) + 2 );
2607
- sprintf (fname , "%s/%s" , configdir , IDENT_FILENAME );
2608
- }
2609
2609
SetConfigOption ("ident_file" , fname , PGC_POSTMASTER , PGC_S_OVERRIDE );
2610
2610
free (fname );
2611
2611
0 commit comments