vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix gettext reload bugs (e.g. inability to disable gettext

Browse source 
once enabled).

	* grub-core/gettext/gettext.c: Encapsulate all static variables in
	main_context and secondary_context. All functions updated.
	(grub_gettext_translate): Rename to ...
	(grub_gettext_translate_real): ... this. Return NULL on failed
	translate.
	(grub_gettext_translate): Handle secondary context.
	(grub_gettext_delete_list): Close file and zero-out the context.
	(grub_mofile_open): Don't call grub_gettext_delete_list.
	Don't close file.
	(grub_gettext_init_ext): Call grub_gettext_init_ext. Skip loading
	if locale="" to avoid pointless error message.
	(grub_gettext_env_write_lang): Update lang even if load fails.
	Handle secondary context.
	(grub_gettext_reread_prefix): New function.
	(read_main): Likewise.
	(read_secondary): Likewise.
	(GRUB_MOD_INIT): Handle secondary context. Hook and export variables.
	(GRUB_MOD_FINI): Handle secondary context. Don't close file.
	* grub-core/normal/main.c (read_lists): Call grub_gettext_reread_prefix.
	* include/grub/normal.h (grub_gettext_reread_prefix): New proto.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-10 23:25:34 +01:00
parent 8e56f87007
commit 17f38c0f8c
4 changed files with 176 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/grub/normal.h
View file

@ -136,4 +136,7 @@ void grub_normal_auth_fini (void);
grub_command_t
grub_dyncmd_get_cmd (grub_command_t cmd);
void
grub_gettext_reread_prefix (const char *val);
#endif /* ! GRUB_NORMAL_HEADER */