Pass the gettext() function to libcom_err

For those e2fsprogs programs which use libcom_err and are
internationalized, pass the gettext() function to libcom_err during
program initialization.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index c95caddffd216915b794c499fd5ed59fe848998b..2f4c232ad2f5ae6125450d94e0e9975eff9fa1cc 100644 (file)
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1120,6 +1120,7 @@ int main (int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        my_ver = ext2fs_parse_version_string(my_ver_string);
        lib_ver = ext2fs_get_library_version(0, &lib_ver_date);

diff --git a/misc/badblocks.c b/misc/badblocks.c
index 168d93e63a6fe9f23aa7bae9efdb4601fc511052..57882416a8ae48c9d9358b1aa7be9c4b6691fc51 100644 (file)
--- a/misc/badblocks.c
+++ b/misc/badblocks.c
@@ -1056,6 +1056,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        srandom((unsigned int)time(NULL));  /* simple randomness is enough */
        test_func = test_ro;

diff --git a/misc/chattr.c b/misc/chattr.c
index 69aaed1cc4aa33e6af45e4faaba3bd44e4e9c12e..8a2d61f9a81b632b481e461dc025ed238bf52fc8 100644 (file)
--- a/misc/chattr.c
+++ b/misc/chattr.c
@@ -301,6 +301,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        if (argc && *argv)
                program_name = *argv;

diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index df241c217ca07d8b708066c66b721df54fa21320..5b114e962c420e973cf473f02e780a8cb40a48c5 100644 (file)
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -507,6 +507,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        add_error_table(&et_ext2_error_table);
        fprintf (stderr, "dumpe2fs %s (%s)\n", E2FSPROGS_VERSION,

diff --git a/misc/e2image.c b/misc/e2image.c
index 4cd834af04886bad8a40abb1fd4b5b15e57dc718..c108a7a234247b58ce0788ae987b468accfb7974 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -1236,6 +1236,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        fprintf (stderr, "e2image %s (%s)\n", E2FSPROGS_VERSION,
                 E2FSPROGS_DATE);

diff --git a/misc/e2initrd_helper.c b/misc/e2initrd_helper.c
index c98a07a29660a111c5a48217b0de6e28b32e2344..b2f39bc443c7fab87033e17f13c6106d8c3d6df1 100644 (file)
--- a/misc/e2initrd_helper.c
+++ b/misc/e2initrd_helper.c
@@ -306,6 +306,7 @@ static void PRS(int argc, char **argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
 
        while ((c = getopt(argc, argv, "rv")) != EOF) {

diff --git a/misc/e2undo.c b/misc/e2undo.c
index c968f912cc85288036e6911fe47c79343c519807..f97ddc2f9e7780fcbe079600cfac085b6480c2ae 100644 (file)
--- a/misc/e2undo.c
+++ b/misc/e2undo.c
@@ -135,6 +135,7 @@ int main(int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        add_error_table(&et_ext2_error_table);
 

diff --git a/misc/findsuper.c b/misc/findsuper.c
index e3baf2e01236a25dc59b6470b78c297ceaaee15b..6b5e16fc1cdd1c775dd95440fd0c8bb34ab33d49 100644 (file)
--- a/misc/findsuper.c
+++ b/misc/findsuper.c
@@ -131,6 +131,7 @@ int main(int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
 
        while ((c = getopt (argc, argv, "j")) != EOF) {

diff --git a/misc/lsattr.c b/misc/lsattr.c
index 1f55db31105ff5521b022842adbd42bbf22d133b..e5e59690f493c7f2c5b7b119ae77d1f1ec865248 100644 (file)
--- a/misc/lsattr.c
+++ b/misc/lsattr.c
@@ -167,6 +167,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        if (argc && *argv)
                program_name = *argv;

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index c439e37d87063c0516a7836433699a6b5e12f9fd..b33ad60218436fffb04b03abb72109db6735ef69 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -2211,6 +2211,7 @@ int main (int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        PRS(argc, argv);
 

diff --git a/misc/partinfo.c b/misc/partinfo.c
index 496607448db26a41f837714a24492f8442f731a4..c461e801d7c75b8cee8dc2d6d1cea4a6c6e25441 100644 (file)
--- a/misc/partinfo.c
+++ b/misc/partinfo.c
@@ -35,6 +35,7 @@ int main(int argc, char **argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        if (argc == 1) {
                fprintf(stderr, _("Usage:  %s device...\n\nPrints out the "

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 88e814b42805c89042306e8bfc78f04510234f5b..36368fb995721461092317010b79e80df858a7bb 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -1852,6 +1852,7 @@ int main(int argc, char **argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        if (argc && *argv)
                program_name = *argv;

diff --git a/misc/uuidgen.c b/misc/uuidgen.c
index f181d193a1ac39e16e2bcff150ced23dfc931208..1dbac8c6e3e02001ea6f3b75478ded73809935b7 100644 (file)
--- a/misc/uuidgen.c
+++ b/misc/uuidgen.c
@@ -46,6 +46,7 @@ main (int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
 
        while ((c = getopt (argc, argv, "tr")) != EOF)

diff --git a/resize/main.c b/resize/main.c
index 659a9234468c7a128e7d06f69679bf044ee530ad..e6e9e7bd53ba1155bf66642cf881c909c6b9ad0d 100644 (file)
--- a/resize/main.c
+++ b/resize/main.c
@@ -181,6 +181,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
 
        add_error_table(&et_ext2_error_table);