summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2008-01-13 18:18:20 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2008-01-13 18:18:20 +0000
commita68e43adf5e389f3dfe874eb036b6dadda1393dd (patch)
treedaab2569ae5883e47bbcb090f50f6698bd3310b5
parent264a0e474abb473014fc6cc2814feb49690a30fd (diff)
downloadmailutils-a68e43adf5e389f3dfe874eb036b6dadda1393dd.tar.gz
mailutils-a68e43adf5e389f3dfe874eb036b6dadda1393dd.tar.bz2
Fix NLS issues.
* configure.ac: Define DEFAULT_TEXT_DOMAIN * comsat/comsat.c, dotlock/dotlock.c, frm/frm.c, frm/from.c, guimb/main.c, imap4d/imap4d.c, maidag/maidag.c, mail/mail.c, mail.local/main.c, mail.remote/mail.remote.c, messages/messages.c, mh/ali.c, mh/anno.c, mh/burst.c, mh/comp.c, mh/fmtcheck.c, mh/folder.c, mh/forw.c, mh/inc.c, mh/install-mh.c, mh/mark.c, mh/mhl.c, mh/mhn.c, mh/mhparam.c, mh/mhpath.c, mh/pick.c, mh/refile.c, mh/repl.c, mh/rmf.c, mh/rmm.c, mh/scan.c, mh/send.c, mh/sortm.c, mh/whatnow.c, mh/whom.c, mimeview/mimeview.c, movemail/movemail.c, pop3d/pop3d.c, pop3d/popauth.c, readmsg/readmsg.c, sieve/sieve.c, Use MU_APP_INIT_NLS instead of mu_init_nls. * mailbox/nls.c (mu_init_nls): Do not call textdomain.
-rw-r--r--ChangeLog23
-rw-r--r--comsat/comsat.c2
-rw-r--r--configure.ac4
-rw-r--r--dotlock/dotlock.c2
-rw-r--r--frm/frm.c4
-rw-r--r--frm/from.c4
-rw-r--r--guimb/guimb.h2
-rw-r--r--guimb/main.c4
-rw-r--r--guimb/util.c2
-rw-r--r--imap4d/imap4d.c2
-rw-r--r--include/mailutils/debug.hm41
-rw-r--r--include/mailutils/nls.h38
-rw-r--r--maidag/maidag.c2
-rw-r--r--maidag/maidag.h2
-rw-r--r--maidag/util.c2
-rw-r--r--mail.local/mail.local.h2
-rw-r--r--mail.local/main.c6
-rw-r--r--mail.remote/mail.remote.c4
-rw-r--r--mail/mail.c6
-rw-r--r--mailbox/nls.c3
-rw-r--r--messages/messages.c4
-rw-r--r--mh/ali.c5
-rw-r--r--mh/anno.c4
-rw-r--r--mh/burst.c4
-rw-r--r--mh/comp.c5
-rw-r--r--mh/fmtcheck.c4
-rw-r--r--mh/folder.c4
-rw-r--r--mh/forw.c5
-rw-r--r--mh/inc.c4
-rw-r--r--mh/install-mh.c4
-rw-r--r--mh/mark.c4
-rw-r--r--mh/mhl.c4
-rw-r--r--mh/mhn.c4
-rw-r--r--mh/mhparam.c4
-rw-r--r--mh/mhpath.c4
-rw-r--r--mh/pick.c4
-rw-r--r--mh/refile.c4
-rw-r--r--mh/repl.c5
-rw-r--r--mh/rmf.c4
-rw-r--r--mh/rmm.c4
-rw-r--r--mh/scan.c4
-rw-r--r--mh/send.c4
-rw-r--r--mh/sortm.c4
-rw-r--r--mh/whatnow.c4
-rw-r--r--mh/whom.c4
-rw-r--r--mimeview/mimeview.c4
-rw-r--r--movemail/movemail.c6
-rw-r--r--pop3d/pop3d.c2
-rw-r--r--pop3d/popauth.c5
-rw-r--r--readmsg/readmsg.c4
-rw-r--r--sieve/sieve.c4
51 files changed, 134 insertions, 110 deletions
diff --git a/ChangeLog b/ChangeLog
index 7eff934d6..dc260b8f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
2008-01-13 Sergey Poznyakoff <gray@gnu.org.ua>
+ Fix NLS issues.
+
+ * configure.ac: Define DEFAULT_TEXT_DOMAIN
+ * comsat/comsat.c, dotlock/dotlock.c, frm/frm.c, frm/from.c,
+ guimb/main.c, imap4d/imap4d.c, maidag/maidag.c, mail/mail.c,
+ mail.local/main.c, mail.remote/mail.remote.c, messages/messages.c,
+ mh/ali.c, mh/anno.c, mh/burst.c, mh/comp.c, mh/fmtcheck.c,
+ mh/folder.c, mh/forw.c, mh/inc.c, mh/install-mh.c, mh/mark.c,
+ mh/mhl.c, mh/mhn.c, mh/mhparam.c, mh/mhpath.c, mh/pick.c,
+ mh/refile.c, mh/repl.c, mh/rmf.c, mh/rmm.c, mh/scan.c, mh/send.c,
+ mh/sortm.c, mh/whatnow.c, mh/whom.c, mimeview/mimeview.c,
+ movemail/movemail.c, pop3d/pop3d.c, pop3d/popauth.c,
+ readmsg/readmsg.c, sieve/sieve.c,
+ Use MU_APP_INIT_NLS instead of mu_init_nls.
+ * mailbox/nls.c (mu_init_nls): Do not call textdomain.
+
+ * guimb/guimb.h, guimb/util.c (util_error): fmt is const.
+ * include/mailutils/debug.hm4: include <mailutils/error.h>
+ * include/mailutils/nls.h: Define _ and N_ only if
+ DEFAULT_TEXT_DOMAIN is defined (for use in the library).
+ * maidag/maidag.h, maidag/util.c (mailer_err) : fmt is const.
+ * mail.local/mail.local.h (mailer_err): All mandatory args are
+ consts.
* mailbox/msrv.c: Include limits.h
2008-01-12 Sergey Poznyakoff <gray@gnu.org.ua>
diff --git a/comsat/comsat.c b/comsat/comsat.c
index 53ee2ec08..51725d773 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -564,7 +564,7 @@ main (int argc, char **argv)
int ind;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mu_argp_init (program_version, NULL);
comsat_init ();
diff --git a/configure.ac b/configure.ac
index 76c68f5f8..5819d8352 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,10 @@ AC_CHECK_TYPE(iconv_t,:,
#endif
])
+AH_BOTTOM([
+#define DEFAULT_TEXT_DOMAIN PACKAGE
+])
+
AC_SUBST(MU_LINK_POSTFLAGS,[`for opt in $LTLIBICONV; do case $opt in -[[lL]]*) echo $opt;; esac; done|tr '\n' ' '`])
diff --git a/dotlock/dotlock.c b/dotlock/dotlock.c
index ed6b66a3c..882b1de02 100644
--- a/dotlock/dotlock.c
+++ b/dotlock/dotlock.c
@@ -152,7 +152,7 @@ main (int argc, char *argv[])
pid_t mailgid = getegid ();
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
/* Drop permissions during argument parsing. */
diff --git a/frm/frm.c b/frm/frm.c
index d2ebc01c8..8d9e72998 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2007 Free Software Foundation, Inc.
+ 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -359,7 +359,7 @@ main (int argc, char **argv)
int status = 0;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
prepare_attrs ();
diff --git a/frm/from.c b/frm/from.c
index a14738d36..b64dd9c8b 100644
--- a/frm/from.c
+++ b/frm/from.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -114,7 +114,7 @@ main (int argc, char **argv)
size_t total;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
/* register the formats. */
mu_register_all_mbox_formats ();
diff --git a/guimb/guimb.h b/guimb/guimb.h
index b4ff3a147..95df1417d 100644
--- a/guimb/guimb.h
+++ b/guimb/guimb.h
@@ -64,7 +64,7 @@ void collect_create_mailbox (void);
void collect_drop_mailbox (void);
int collect_output (void);
-void util_error (char *fmt, ...) MU_PRINTFLIKE(1, 2);
+void util_error (const char *fmt, ...) MU_PRINTFLIKE(1, 2);
int util_tempfile (char **namep);
struct guimb_data
diff --git a/guimb/main.c b/guimb/main.c
index a5f954e15..64c548b1a 100644
--- a/guimb/main.c
+++ b/guimb/main.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2007 Free Software Foundation, Inc.
+ 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -155,7 +155,7 @@ main (int argc, char *argv[])
struct guimb_data gd;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
append_arg ("");
diff --git a/guimb/util.c b/guimb/util.c
index 1e09480db..463d3687c 100644
--- a/guimb/util.c
+++ b/guimb/util.c
@@ -20,7 +20,7 @@
#include "guimb.h"
void
-util_error (char *fmt, ...)
+util_error (const char *fmt, ...)
{
va_list ap;
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index 11ffdc281..4dd6bbd14 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -461,7 +461,7 @@ main (int argc, char **argv)
int status = EXIT_SUCCESS;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
state = STATE_NONAUTH; /* Starting state in non-auth. */
diff --git a/include/mailutils/debug.hm4 b/include/mailutils/debug.hm4
index 0f8b1e9a0..12fc79c12 100644
--- a/include/mailutils/debug.hm4
+++ b/include/mailutils/debug.hm4
@@ -22,6 +22,7 @@
#include <stdarg.h>
#include <mailutils/types.h>
+#include <mailutils/error.h>
#define MU_DEBUG(d,l,s) MU_DEBUG1(d,l,"%s",s)
diff --git a/include/mailutils/nls.h b/include/mailutils/nls.h
index c183f7d5a..21e765cbc 100644
--- a/include/mailutils/nls.h
+++ b/include/mailutils/nls.h
@@ -20,31 +20,23 @@
#define _MAILUTILS_NLS_H
#include <mailutils/types.h>
-
-/*
- Native Language Support
-*/
-
-#ifdef ENABLE_NLS
-# ifdef WITH_INCLUDED_LIBINTL
-# include <libgnuintl.h>
+#if defined(DEFAULT_TEXT_DOMAIN)
+# include <locale.h>
+# include <gettext.h>
+# define _(string) gettext (string)
+# define N_(string) string
+# ifdef ENABLE_NLS
+# define MU_APP_INIT_NLS() \
+ do \
+ { \
+ setlocale (LC_ALL, ""); \
+ mu_init_nls (); \
+ } \
+ while (0)
# else
-# include <libintl.h>
+# define MU_APP_INIT_NLS()
# endif
-# define _(String) gettext(String)
-# define N_(String) String
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif /* HAVE_LOCALE_H */
-#else
-# define _(String) (String)
-# define N_(String) String
-# define gettext(msgid) (msgid)
-# define dgettext(domain, msgid) (msgid)
-# define ngettext(sg,pl,cnt) (cnt == 1) ? (sg) : (pl)
-# define textdomain(Domain)
-# define bindtextdomain(Package, Directory)
-#endif /* ENABLE_NLS */
+#endif
#ifdef __cplusplus
extern "C" {
diff --git a/maidag/maidag.c b/maidag/maidag.c
index 2827e2efc..7b20267c9 100644
--- a/maidag/maidag.c
+++ b/maidag/maidag.c
@@ -449,7 +449,7 @@ main (int argc, char *argv[])
umask (0077);
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
/* Default locker settings */
mu_locker_set_default_flags (MU_LOCKER_PID|MU_LOCKER_RETRY,
diff --git a/maidag/maidag.h b/maidag/maidag.h
index a27b582d9..c92211307 100644
--- a/maidag/maidag.h
+++ b/maidag/maidag.h
@@ -136,7 +136,7 @@ int maidag_lmtp_server (void);
int lmtp_connection (int fd, struct sockaddr *sa, int salen, void *data,
mu_ip_server_t srv, time_t timeout, int transcript);
-void mailer_err (char *fmt, ...);
+void mailer_err (const char *fmt, ...) MU_PRINTFLIKE(1, 2);
void notify_biff (mu_mailbox_t mbox, char *name, size_t size);
void guess_retval (int ec);
diff --git a/maidag/util.c b/maidag/util.c
index fae6dff96..f0e41de1f 100644
--- a/maidag/util.c
+++ b/maidag/util.c
@@ -64,7 +64,7 @@ switch_user_id (struct mu_auth_data *auth, int user)
}
void
-mailer_err (char *fmt, ...)
+mailer_err (const char *fmt, ...)
{
va_list ap;
diff --git a/mail.local/mail.local.h b/mail.local/mail.local.h
index 4ecd22bc6..db3e12fd8 100644
--- a/mail.local/mail.local.h
+++ b/mail.local/mail.local.h
@@ -110,7 +110,7 @@ extern int check_quota (struct mu_auth_data *auth,
int mda (mu_mailbox_t mbx, char *username);
int switch_user_id (struct mu_auth_data *auth, int user);
-void mailer_err (char *msg, char *arg, char *fmt, ...)
+void mailer_err (const char *msg, const char *arg, const char *fmt, ...)
MU_PRINTFLIKE(3,4);
#ifdef WITH_GUILE
diff --git a/mail.local/main.c b/mail.local/main.c
index 2e38b7dd8..a7ff2c0d5 100644
--- a/mail.local/main.c
+++ b/mail.local/main.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2005,
- 2007 Free Software Foundation, Inc.
+ 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -375,7 +375,7 @@ main (int argc, char *argv[])
umask (0077);
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
/* Default locker settings */
mu_locker_set_default_flags (MU_LOCKER_PID|MU_LOCKER_RETRY,
@@ -991,7 +991,7 @@ notify_biff (mu_mailbox_t mbox, char *name, size_t size)
}
void
-mailer_err (char *msg, char *arg, char *fmt, ...)
+mailer_err (const char *msg, const char *arg, const char *fmt, ...)
{
va_list ap;
diff --git a/mail.remote/mail.remote.c b/mail.remote/mail.remote.c
index 9707f54c9..44ab66b9c 100644
--- a/mail.remote/mail.remote.c
+++ b/mail.remote/mail.remote.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2004,
- 2005, 2007 Free Software Foundation, Inc.
+ 2005, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -186,7 +186,7 @@ main (int argc, char **argv)
int mailer_flags = 0;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
/* Register mailers. */
mu_registrar_record (mu_smtp_record);
diff --git a/mail/mail.c b/mail/mail.c
index 0abe376b0..553448f42 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -21,7 +21,7 @@
#include "mailutils/libargp.h"
/* Global variables and constants*/
-mu_mailbox_t mbox; /* Mailbox being operated upon */
+mu_mailbox_t mbox; /* Mailbox being operated upon */
size_t total; /* Total number of messages in the mailbox */
FILE *ofile; /* Output file */
int interactive; /* Is the session interactive */
@@ -295,8 +295,8 @@ main (int argc, char **argv)
set_cursor (1);
/* Native Language Support */
- mu_init_nls ();
-
+ MU_APP_INIT_NLS ();
+
/* Register the desired formats. */
mu_register_all_formats ();
diff --git a/mailbox/nls.c b/mailbox/nls.c
index 25f4a5d64..df042f6bc 100644
--- a/mailbox/nls.c
+++ b/mailbox/nls.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2002, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006, 2007, 2008 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -56,7 +56,6 @@ mu_init_nls (void)
#ifdef ENABLE_NLS
mu_locale_set = mu_set_locale ("");
bindtextdomain (PACKAGE, LOCALEDIR);
- textdomain (PACKAGE);
#endif /* ENABLE_NLS */
}
diff --git a/messages/messages.c b/messages/messages.c
index 62366577b..66c9e7511 100644
--- a/messages/messages.c
+++ b/messages/messages.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2007 Free Software Foundation, Inc.
+ 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -104,7 +104,7 @@ main (int argc, char **argv)
struct arguments args = {0, NULL};
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
/* register the formats. */
mu_register_all_mbox_formats ();
diff --git a/mh/ali.c b/mh/ali.c
index 7e1c0ae99..21264ef00 100644
--- a/mh/ali.c
+++ b/mh/ali.c
@@ -1,5 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2006, 2007,
+ 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -192,7 +193,7 @@ main (int argc, char **argv)
int index;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/anno.c b/mh/anno.c
index 87bc8f0f9..df30c0a19 100644
--- a/mh/anno.c
+++ b/mh/anno.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -116,7 +116,7 @@ main (int argc, char **argv)
mh_msgset_t msgset;
size_t len;
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/burst.c b/mh/burst.c
index a5177107b..1c0c796df 100644
--- a/mh/burst.c
+++ b/mh/burst.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -548,7 +548,7 @@ main (int argc, char **argv)
const char *tempfolder = mh_global_profile_get ("Temp-Folder", ".temp");
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/comp.c b/mh/comp.c
index 69ae0b338..148fed8ca 100644
--- a/mh/comp.c
+++ b/mh/comp.c
@@ -1,5 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007,
+ 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -210,7 +211,7 @@ main (int argc, char **argv)
int index;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/fmtcheck.c b/mh/fmtcheck.c
index 0522c1849..51491c0bb 100644
--- a/mh/fmtcheck.c
+++ b/mh/fmtcheck.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005,
- 2006, 2007 Free Software Foundation, Inc.
+ 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -103,7 +103,7 @@ int
main (int argc, char **argv)
{
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/folder.c b/mh/folder.c
index c88c42556..72f86f5b7 100644
--- a/mh/folder.c
+++ b/mh/folder.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003,
- 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -935,7 +935,7 @@ main (int argc, char **argv)
mh_msgset_t msgset;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/forw.c b/mh/forw.c
index dd57f8666..977c347b9 100644
--- a/mh/forw.c
+++ b/mh/forw.c
@@ -1,5 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007,
+ 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -423,7 +424,7 @@ main (int argc, char **argv)
int index, rc;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/inc.c b/mh/inc.c
index ecbabb82c..3ebd4aee7 100644
--- a/mh/inc.c
+++ b/mh/inc.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003,
- 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -179,7 +179,7 @@ main (int argc, char **argv)
int rc;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/install-mh.c b/mh/install-mh.c
index c9f8d7409..ae15451f8 100644
--- a/mh/install-mh.c
+++ b/mh/install-mh.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -69,7 +69,7 @@ main (int argc, char **argv)
extern int mh_auto_install;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_auto_install = 0;
diff --git a/mh/mark.c b/mh/mark.c
index 7957f1a3c..78f826059 100644
--- a/mh/mark.c
+++ b/mh/mark.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -193,7 +193,7 @@ main (int argc, char **argv)
mu_mailbox_t mbox;
mu_url_t url;
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
opt_handler, NULL, &index);
diff --git a/mh/mhl.c b/mh/mhl.c
index de3d308d0..ebc23807e 100644
--- a/mh/mhl.c
+++ b/mh/mhl.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -222,7 +222,7 @@ main (int argc, char **argv)
interactive = isatty (1) && isatty (0);
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
opt_handler, NULL, &index);
diff --git a/mh/mhn.c b/mh/mhn.c
index dc868aa71..26ac0d071 100644
--- a/mh/mhn.c
+++ b/mh/mhn.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2761,7 +2761,7 @@ main (int argc, char **argv)
int rc;
int index;
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/mhparam.c b/mh/mhparam.c
index 593d50ee5..d4b7fe5c4 100644
--- a/mh/mhparam.c
+++ b/mh/mhparam.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -123,7 +123,7 @@ main (int argc, char **argv)
int index;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/mhpath.c b/mh/mhpath.c
index dc2e0f542..53f32e35a 100644
--- a/mh/mhpath.c
+++ b/mh/mhpath.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -80,7 +80,7 @@ main (int argc, char **argv)
const char *current_folder;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/pick.c b/mh/pick.c
index bdd57bde4..3b8a04d4a 100644
--- a/mh/pick.c
+++ b/mh/pick.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -347,7 +347,7 @@ main (int argc, char **argv)
int flags;
flags = mh_interactive_mode_p () ? 0 : ARGP_NO_ERRS;
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, flags, options, mh_option,
args_doc, doc, opt_handler, NULL, &index);
diff --git a/mh/refile.c b/mh/refile.c
index 8f44e12e7..aa816047a 100644
--- a/mh/refile.c
+++ b/mh/refile.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2002, 2003, 2004, 2005, 2006,
- 2007 Free Software Foundation, Inc.
+ 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -229,7 +229,7 @@ main (int argc, char **argv)
int status, i, j;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/repl.c b/mh/repl.c
index 235b4c76a..52d3ec872 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -1,5 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2005, 2006, 2007,
+ 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -403,7 +404,7 @@ main (int argc, char **argv)
int index, rc;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
diff --git a/mh/rmf.c b/mh/rmf.c
index f5b6123a9..95467519e 100644
--- a/mh/rmf.c
+++ b/mh/rmf.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -192,7 +192,7 @@ main (int argc, char **argv)
char *name;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/rmm.c b/mh/rmm.c
index 5f2d79e71..b77120c86 100644
--- a/mh/rmm.c
+++ b/mh/rmm.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -75,7 +75,7 @@ main (int argc, char **argv)
int status;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/scan.c b/mh/scan.c
index 8e3e5d0e0..04df7585d 100644
--- a/mh/scan.c
+++ b/mh/scan.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003,
- 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -176,7 +176,7 @@ main (int argc, char **argv)
size_t total = 0;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/send.c b/mh/send.c
index ef236e734..42a60fc73 100644
--- a/mh/send.c
+++ b/mh/send.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -732,7 +732,7 @@ main (int argc, char **argv)
{
int index;
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/sortm.c b/mh/sortm.c
index 284c6b419..231cdc06c 100644
--- a/mh/sortm.c
+++ b/mh/sortm.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -553,7 +553,7 @@ main (int argc, char **argv)
int index;
mu_url_t url;
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option,
args_doc, doc, opt_handler, NULL, &index);
diff --git a/mh/whatnow.c b/mh/whatnow.c
index ea79a75d0..55964ae47 100644
--- a/mh/whatnow.c
+++ b/mh/whatnow.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@ main (int argc, char **argv)
{
int index;
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mh/whom.c b/mh/whom.c
index a9e286bd2..06ed57785 100644
--- a/mh/whom.c
+++ b/mh/whom.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -111,7 +111,7 @@ main (int argc, char **argv)
int index;
char *name = "draft";
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mh_argp_init (program_version);
mh_argp_parse (&argc, &argv, 0, options, mh_option, args_doc, doc,
diff --git a/mimeview/mimeview.c b/mimeview/mimeview.c
index 2e71c107c..9f6197cfc 100644
--- a/mimeview/mimeview.c
+++ b/mimeview/mimeview.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -281,7 +281,7 @@ main (int argc, char **argv)
{
int index;
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mu_argp_init (program_version, NULL);
if (mu_app_init (&argp, capa, mimeview_cfg_param,
argc, argv, 0, &index, NULL))
diff --git a/movemail/movemail.c b/movemail/movemail.c
index 9719c8007..c1dc0bd13 100644
--- a/movemail/movemail.c
+++ b/movemail/movemail.c
@@ -1,5 +1,5 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -110,7 +110,7 @@ static const char *movemail_capa[] = {
};
void
-die (mu_mailbox_t mbox, char *msg, int status)
+die (mu_mailbox_t mbox, const char *msg, int status)
{
mu_url_t url = NULL;
@@ -287,7 +287,7 @@ main (int argc, char **argv)
int flags;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
/* Register the desired mailbox formats. */
mu_register_all_mbox_formats ();
diff --git a/pop3d/pop3d.c b/pop3d/pop3d.c
index bc96139df..a9928a836 100644
--- a/pop3d/pop3d.c
+++ b/pop3d/pop3d.c
@@ -463,7 +463,7 @@ main (int argc, char **argv)
int status = OK;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
MU_AUTH_REGISTER_ALL_MODULES();
/* Register the desired formats. */
diff --git a/pop3d/popauth.c b/pop3d/popauth.c
index a786a0328..a4daa92ba 100644
--- a/pop3d/popauth.c
+++ b/pop3d/popauth.c
@@ -1,5 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2005, 2007,
+ 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -199,7 +200,7 @@ main(int argc, char **argv)
struct action_data adata;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mu_argp_init (program_version, NULL);
if (mu_app_init (&argp, popauth_argp_capa, NULL,
diff --git a/readmsg/readmsg.c b/readmsg/readmsg.c
index 4c3722855..470ba3cf8 100644
--- a/readmsg/readmsg.c
+++ b/readmsg/readmsg.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2007 Free Software Foundation, Inc.
+ 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -296,7 +296,7 @@ main (int argc, char **argv)
int unix_header = 0;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
/* register the formats. */
mu_register_all_mbox_formats ();
diff --git a/sieve/sieve.c b/sieve/sieve.c
index 511f7d403..50f61fab0 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -1,6 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003,
- 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -371,7 +371,7 @@ main (int argc, char *argv[])
int rc;
/* Native Language Support */
- mu_init_nls ();
+ MU_APP_INIT_NLS ();
mu_argp_init (program_version, NULL);
#ifdef WITH_TLS

Return to:

Send suggestions and report system problems to the System administrator.