NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitf6e9cbf

committed

Report more information if pg_perm_setlocale() fails at startup.

We don't know why a few Windows users have seen this fail, but thetaciturnity of the error message certainly isn't helping debug it.Let's at least find out which LC category isn't working.

1 parent21187cf commitf6e9cbfCopy full SHA for f6e9cbf

File tree

1 file changed

+14

-13

lines changed

src/backend/main
- main.c

1 file changed

+14

-13

lines changed

`‎src/backend/main/main.c`

Lines changed: 14 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ const char *progname;`
`43`	`43`
`44`	`44`
`45`	`45`	`staticvoidstartup_hacks(constchar*progname);`
`46`		`-staticvoidinit_locale(intcategory,constchar*locale);`
	`46`	`+staticvoidinit_locale(constcharcategoryname,intcategory,constcharlocale);`
`47`	`47`	`staticvoidhelp(constchar*progname);`
`48`	`48`	`staticvoidcheck_root(constchar*progname);`
`49`	`49`
`@@ -116,31 +116,31 @@ main(int argc, char *argv[])`
`116`	`116`	`char*env_locale;`
`117`	`117`
`118`	`118`	`if ((env_locale=getenv("LC_COLLATE"))!=NULL)`
`119`		`-init_locale(LC_COLLATE,env_locale);`
	`119`	`+init_locale("LC_COLLATE",LC_COLLATE,env_locale);`
`120`	`120`	`else`
`121`		`-init_locale(LC_COLLATE,"");`
	`121`	`+init_locale("LC_COLLATE",LC_COLLATE,"");`
`122`	`122`
`123`	`123`	`if ((env_locale=getenv("LC_CTYPE"))!=NULL)`
`124`		`-init_locale(LC_CTYPE,env_locale);`
	`124`	`+init_locale("LC_CTYPE",LC_CTYPE,env_locale);`
`125`	`125`	`else`
`126`		`-init_locale(LC_CTYPE,"");`
	`126`	`+init_locale("LC_CTYPE",LC_CTYPE,"");`
`127`	`127`	`}`
`128`	`128`	`#else`
`129`		`-init_locale(LC_COLLATE,"");`
`130`		`-init_locale(LC_CTYPE,"");`
	`129`	`+init_locale("LC_COLLATE",LC_COLLATE,"");`
	`130`	`+init_locale("LC_CTYPE",LC_CTYPE,"");`
`131`	`131`	`#endif`
`132`	`132`
`133`	`133`	`#ifdefLC_MESSAGES`
`134`		`-init_locale(LC_MESSAGES,"");`
	`134`	`+init_locale("LC_MESSAGES",LC_MESSAGES,"");`
`135`	`135`	`#endif`
`136`	`136`
`137`	`137`	`/*`
`138`	`138`	`* We keep these set to "C" always, except transiently in pg_locale.c; see`
`139`	`139`	`* that file for explanations.`
`140`	`140`	`*/`
`141`		`-init_locale(LC_MONETARY,"C");`
`142`		`-init_locale(LC_NUMERIC,"C");`
`143`		`-init_locale(LC_TIME,"C");`
	`141`	`+init_locale("LC_MONETARY",LC_MONETARY,"C");`
	`142`	`+init_locale("LC_NUMERIC",LC_NUMERIC,"C");`
	`143`	`+init_locale("LC_TIME",LC_TIME,"C");`
`144`	`144`
`145`	`145`	`/*`
`146`	`146`	`* Now that we have absorbed as much as we wish to from the locale`
`@@ -280,11 +280,12 @@ startup_hacks(const char *progname)`
`280`	`280`	`* category's environment variable.`
`281`	`281`	`*/`
`282`	`282`	`staticvoid`
`283`		`-init_locale(intcategory,constchar*locale)`
	`283`	`+init_locale(constcharcategoryname,intcategory,constcharlocale)`
`284`	`284`	`{`
`285`	`285`	`if (pg_perm_setlocale(category,locale)==NULL&&`
`286`	`286`	`pg_perm_setlocale(category,"C")==NULL)`
`287`		`-elog(FATAL,"could not adopt C locale");`
	`287`	`+elog(FATAL,"could not adopt \"%s\" locale nor C locale for %s",`
	`288`	`+locale,categoryname);`
`288`	`289`	`}`
`289`	`290`
`290`	`291`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf6e9cbf

File tree

1 file changed

1 file changed

`‎src/backend/main/main.c`

0 commit comments