From 3c0eae66fa37c569d2f3d1739816836dbbde9860 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Mon, 26 Mar 2012 16:07:42 +0200 Subject: [PATCH] * grub-core/gettext/gettext.c (GRUB_MOD_INIT): Handle errors. --- ChangeLog | 4 ++++ grub-core/gettext/gettext.c | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85a6f74df..872fe61ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-03-26 Vladimir Serbinenko + + * grub-core/gettext/gettext.c (GRUB_MOD_INIT): Handle errors. + 2012-03-19 Vladimir Serbinenko * util/getroot.c (grub_make_system_path_relative_to_its_root): Fix diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c index 27a47ce56..b7ad956dc 100644 --- a/grub-core/gettext/gettext.c +++ b/grub-core/gettext/gettext.c @@ -451,13 +451,18 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)), GRUB_MOD_INIT (gettext) { const char *lang; + grub_err_t err; lang = grub_env_get ("lang"); - grub_gettext_init_ext (&main_context, lang, grub_env_get ("locale_dir"), - grub_env_get ("prefix")); - grub_gettext_init_ext (&secondary_context, lang, - grub_env_get ("secondary_locale_dir"), 0); + err = grub_gettext_init_ext (&main_context, lang, grub_env_get ("locale_dir"), + grub_env_get ("prefix")); + if (err) + grub_print_error (); + err = grub_gettext_init_ext (&secondary_context, lang, + grub_env_get ("secondary_locale_dir"), 0); + if (err) + grub_print_error (); grub_register_variable_hook ("locale_dir", NULL, read_main); grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);