3939 * Portions Copyright (c) 1994, Regents of the University of California
4040 * Portions taken from FreeBSD.
4141 *
42- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.29 2004/05/14 17:04:46 momjian Exp $
42+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.30 2004/05/17 13: 17:29 momjian Exp $
4343 *
4444 *-------------------------------------------------------------------------
4545 */
@@ -130,7 +130,7 @@ static const char *backend_options = "-F -O -c search_path=pg_catalog -c exit_on
130130
131131/* path to 'initdb' binary directory */
132132char bindir [MAXPGPATH ];
133- char backendbin [MAXPGPATH ];
133+ char backend_exec [MAXPGPATH ];
134134
135135static void * xmalloc (size_t size );
136136static char * xstrdup (const char * s );
@@ -819,7 +819,7 @@ test_connections(void)
819819"\"%s\" -boot -x0 %s "
820820"-c shared_buffers=%d -c max_connections=%d template1 "
821821"<%s >%s 2>&1" ,
822- backendbin ,boot_options ,
822+ backend_exec ,boot_options ,
823823conns [i ]* 5 ,conns [i ],
824824DEVNULL ,DEVNULL );
825825status = system (cmd );
@@ -855,7 +855,7 @@ test_buffers(void)
855855"\"%s\" -boot -x0 %s "
856856"-c shared_buffers=%d -c max_connections=%d template1 "
857857"<%s >%s 2>&1" ,
858- backendbin ,boot_options ,
858+ backend_exec ,boot_options ,
859859bufs [i ],n_connections ,
860860DEVNULL ,DEVNULL );
861861status = system (cmd );
@@ -1004,7 +1004,7 @@ bootstrap_template1(char *short_version)
10041004
10051005snprintf (cmd ,sizeof (cmd ),
10061006"\"%s\" -boot -x1 %s %s template1" ,
1007- backendbin ,boot_options ,talkargs );
1007+ backend_exec ,boot_options ,talkargs );
10081008
10091009PG_CMD_OPEN ;
10101010
@@ -1054,7 +1054,7 @@ setup_shadow(void)
10541054
10551055snprintf (cmd ,sizeof (cmd ),
10561056"\"%s\" %s template1 >%s" ,
1057- backendbin ,backend_options ,
1057+ backend_exec ,backend_options ,
10581058DEVNULL );
10591059
10601060PG_CMD_OPEN ;
@@ -1094,7 +1094,7 @@ get_set_pwd(void)
10941094
10951095snprintf (cmd ,sizeof (cmd ),
10961096"\"%s\" %s template1 >%s" ,
1097- backendbin ,backend_options ,
1097+ backend_exec ,backend_options ,
10981098DEVNULL );
10991099
11001100PG_CMD_OPEN ;
@@ -1148,7 +1148,7 @@ unlimit_systables(void)
11481148
11491149snprintf (cmd ,sizeof (cmd ),
11501150"\"%s\" %s template1 >%s" ,
1151- backendbin ,backend_options ,
1151+ backend_exec ,backend_options ,
11521152DEVNULL );
11531153
11541154PG_CMD_OPEN ;
@@ -1221,7 +1221,7 @@ setup_depend(void)
12211221
12221222snprintf (cmd ,sizeof (cmd ),
12231223"\"%s\" %s template1 >%s" ,
1224- backendbin ,backend_options ,
1224+ backend_exec ,backend_options ,
12251225DEVNULL );
12261226
12271227PG_CMD_OPEN ;
@@ -1254,7 +1254,7 @@ setup_sysviews(void)
12541254 */
12551255snprintf (cmd ,sizeof (cmd ),
12561256"\"%s\" %s -N template1 >%s" ,
1257- backendbin ,backend_options ,
1257+ backend_exec ,backend_options ,
12581258DEVNULL );
12591259
12601260PG_CMD_OPEN ;
@@ -1286,7 +1286,7 @@ setup_description(void)
12861286
12871287snprintf (cmd ,sizeof (cmd ),
12881288"\"%s\" %s template1 >%s" ,
1289- backendbin ,backend_options ,
1289+ backend_exec ,backend_options ,
12901290DEVNULL );
12911291
12921292PG_CMD_OPEN ;
@@ -1334,7 +1334,7 @@ setup_conversion(void)
13341334
13351335snprintf (cmd ,sizeof (cmd ),
13361336"\"%s\" %s template1 >%s" ,
1337- backendbin ,backend_options ,
1337+ backend_exec ,backend_options ,
13381338DEVNULL );
13391339
13401340PG_CMD_OPEN ;
@@ -1390,7 +1390,7 @@ setup_privileges(void)
13901390
13911391snprintf (cmd ,sizeof (cmd ),
13921392"\"%s\" %s template1 >%s" ,
1393- backendbin ,backend_options ,
1393+ backend_exec ,backend_options ,
13941394DEVNULL );
13951395
13961396PG_CMD_OPEN ;
@@ -1453,7 +1453,7 @@ setup_schema(void)
14531453 */
14541454snprintf (cmd ,sizeof (cmd ),
14551455"\"%s\" %s -N template1 >%s" ,
1456- backendbin ,backend_options ,
1456+ backend_exec ,backend_options ,
14571457DEVNULL );
14581458
14591459PG_CMD_OPEN ;
@@ -1470,7 +1470,7 @@ setup_schema(void)
14701470
14711471snprintf (cmd ,sizeof (cmd ),
14721472"\"%s\" %s template1 >%s" ,
1473- backendbin ,backend_options ,
1473+ backend_exec ,backend_options ,
14741474DEVNULL );
14751475
14761476PG_CMD_OPEN ;
@@ -1510,7 +1510,7 @@ vacuum_db(void)
15101510
15111511snprintf (cmd ,sizeof (cmd ),
15121512"\"%s\" %s template1 >%s" ,
1513- backendbin ,backend_options ,
1513+ backend_exec ,backend_options ,
15141514DEVNULL );
15151515
15161516PG_CMD_OPEN ;
@@ -1566,7 +1566,7 @@ make_template0(void)
15661566
15671567snprintf (cmd ,sizeof (cmd ),
15681568"\"%s\" %s template1 >%s" ,
1569- backendbin ,backend_options ,
1569+ backend_exec ,backend_options ,
15701570DEVNULL );
15711571
15721572PG_CMD_OPEN ;
@@ -1933,7 +1933,7 @@ main(int argc, char *argv[])
19331933putenv (pgdenv );
19341934
19351935if ((ret = find_other_exec (argv [0 ],"postgres" ,PG_VERSIONSTR ,
1936- backendbin ))< 0 )
1936+ backend_exec ))< 0 )
19371937{
19381938if (ret == -1 )
19391939fprintf (stderr ,
@@ -1951,7 +1951,7 @@ main(int argc, char *argv[])
19511951}
19521952
19531953/* store binary directory */
1954- strcpy (bindir ,backendbin );
1954+ strcpy (bindir ,backend_exec );
19551955* last_path_separator (bindir )= '\0' ;
19561956
19571957if ((short_version = get_short_version ())== NULL )