@@ -145,7 +145,7 @@ static char *xlog_dir = NULL;
145145
146146/* internal vars */
147147static const char * progname ;
148- static char * encodingid = "0" ;
148+ static int encodingid ;
149149static char * bki_file ;
150150static char * desc_file ;
151151static char * shdesc_file ;
@@ -236,7 +236,7 @@ static void writefile(char *path, char **lines);
236236static FILE * popen_check (const char * command ,const char * mode );
237237static void exit_nicely (void );
238238static char * get_id (void );
239- static char * get_encoding_id (char * encoding_name );
239+ static int get_encoding_id (char * encoding_name );
240240static void set_input (char * * dest ,char * filename );
241241static void check_input (char * path );
242242static void write_version_file (char * extrapath );
@@ -636,15 +636,15 @@ encodingid_to_string(int enc)
636636/*
637637 * get the encoding id for a given encoding name
638638 */
639- static char *
639+ static int
640640get_encoding_id (char * encoding_name )
641641{
642642int enc ;
643643
644644if (encoding_name && * encoding_name )
645645{
646646if ((enc = pg_valid_server_encoding (encoding_name )) >=0 )
647- return encodingid_to_string ( enc ) ;
647+ return enc ;
648648}
649649fprintf (stderr ,_ ("%s: \"%s\" is not a valid server encoding name\n" ),
650650progname ,encoding_name ?encoding_name :"(null)" );
@@ -1328,7 +1328,7 @@ bootstrap_template1(void)
13281328
13291329bki_lines = replace_token (bki_lines ,"POSTGRES" ,escape_quotes (username ));
13301330
1331- bki_lines = replace_token (bki_lines ,"ENCODING" ,encodingid );
1331+ bki_lines = replace_token (bki_lines ,"ENCODING" ,encodingid_to_string ( encodingid ) );
13321332
13331333bki_lines = replace_token (bki_lines ,"LC_COLLATE" ,escape_quotes (lc_collate ));
13341334
@@ -2454,8 +2454,6 @@ setup_bin_paths(const char *argv0)
24542454void
24552455setup_locale_encoding (void )
24562456{
2457- int user_enc ;
2458-
24592457setlocales ();
24602458
24612459if (strcmp (lc_ctype ,lc_collate )== 0 &&
@@ -2505,12 +2503,11 @@ setup_locale_encoding(void)
25052503 * UTF-8.
25062504 */
25072505#ifdef WIN32
2506+ encodingid = PG_UTF8 ;
25082507printf (_ ("Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
25092508"The default database encoding will be set to \"%s\" instead.\n" ),
25102509pg_encoding_to_char (ctype_enc ),
2511- pg_encoding_to_char (PG_UTF8 ));
2512- ctype_enc = PG_UTF8 ;
2513- encodingid = encodingid_to_string (ctype_enc );
2510+ pg_encoding_to_char (encodingid ));
25142511#else
25152512fprintf (stderr ,
25162513_ ("%s: locale \"%s\" requires unsupported encoding \"%s\"\n" ),
@@ -2524,17 +2521,16 @@ setup_locale_encoding(void)
25242521}
25252522else
25262523{
2527- encodingid = encodingid_to_string ( ctype_enc ) ;
2524+ encodingid = ctype_enc ;
25282525printf (_ ("The default database encoding has accordingly been set to \"%s\".\n" ),
2529- pg_encoding_to_char (ctype_enc ));
2526+ pg_encoding_to_char (encodingid ));
25302527}
25312528}
25322529else
25332530encodingid = get_encoding_id (encoding );
25342531
2535- user_enc = atoi (encodingid );
2536- if (!check_locale_encoding (lc_ctype ,user_enc )||
2537- !check_locale_encoding (lc_collate ,user_enc ))
2532+ if (!check_locale_encoding (lc_ctype ,encodingid )||
2533+ !check_locale_encoding (lc_collate ,encodingid ))
25382534exit (1 );/* check_locale_encoding printed the error */
25392535
25402536}