4343 * Portions Copyright (c) 1994, Regents of the University of California
4444 * Portions taken from FreeBSD.
4545 *
46- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.25 2004/05/05 21:18:29 tgl Exp $
46+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.26 2004/05/10 20:51:58 momjian Exp $
4747 *
4848 *-------------------------------------------------------------------------
4949 */
@@ -149,35 +149,36 @@ static const char *backend_options = "-F -O -c search_path=pg_catalog -c exit_on
149149char * pgpath ;
150150
151151/* forward declare all our functions */
152- static bool rmtree (char * ,bool );
153- static void exit_nicely (void );
154152#ifdef WIN32
155153static char * expanded_path (char * );
156154#else
157155#define expanded_path (x ) (x)
158156#endif
159- static char * * readfile (char * );
160- static void writefile (char * ,char * * );
157+
158+ static void * xmalloc (size_t size );
159+ static char * xstrdup (const char * s );
160+ static bool rmtree (char * path ,bool rmtopdir );
161+ static char * * replace_token (char * * lines ,char * token ,char * replacement );
162+ static char * * readfile (char * path );
163+ static void writefile (char * path ,char * * lines );
161164static void pclose_check (FILE * stream );
165+ static int mkdir_p (char * path ,mode_t omode );
166+ static void exit_nicely (void );
162167static char * get_id (void );
163- static char * get_encoding_id (char * );
168+ static char * get_encoding_id (char * encoding_name );
164169static char * get_short_version (void );
165- static int mkdir_p (char * ,mode_t );
166- static int check_data_dir (void );
167- static bool mkdatadir (char * );
168- static bool chklocale (const char * );
169- static void setlocales (void );
170- static void set_input (char * * ,char * );
170+ static int check_data_dir (void );
171+ static bool mkdatadir (char * subdir );
172+ static void set_input (char * * dest ,char * filename );
171173static void check_input (char * path );
172- static int find_postgres (char * );
173- static int set_paths (void );
174- static char * * replace_token (char * * ,char * ,char * );
175- static void set_short_version (char * ,char * );
174+ static int find_postgres (char * path );
175+ static int set_paths (void );
176+ static void set_short_version (char * short_version ,char * extrapath );
176177static void set_null_conf (void );
177- static void test_buffers (void );
178178static void test_connections (void );
179+ static void test_buffers (void );
179180static void setup_config (void );
180- static void bootstrap_template1 (char * );
181+ static void bootstrap_template1 (char * short_version );
181182static void setup_shadow (void );
182183static void get_set_pwd (void );
183184static void unlimit_systables (void );
@@ -190,13 +191,14 @@ static void set_info_version(void);
190191static void setup_schema (void );
191192static void vacuum_db (void );
192193static void make_template0 (void );
193- static void usage (const char * );
194- static void trapsig (int );
194+ static void trapsig (int signum );
195195static void check_ok (void );
196- static char * xstrdup (const char * );
197- static void * xmalloc (size_t );
196+ static bool chklocale (const char * locale );
197+ static void setlocales (void );
198+ static void usage (const char * progname );
198199static void init_nls (void );
199200
201+
200202/*
201203 * macros for running pipes to postgres
202204 */