From ccf4f175ef4c4e7522f9510a4a1149c15d810dd9 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Mon, 4 Jun 2012 20:23:28 +0200 Subject: [PATCH] Removed configure flag --disable-locale and have it always enabled. Todays system are assumed to have locale support. --- configure.ac | 11 ----------- uip/ali.c | 2 -- uip/anno.c | 2 -- uip/ap.c | 2 -- uip/burst.c | 2 -- uip/comp.c | 3 --- uip/dist.c | 2 -- uip/dp.c | 2 -- uip/flist.c | 2 -- uip/fmtdump.c | 2 -- uip/folder.c | 2 -- uip/forw.c | 2 -- uip/inc.c | 2 -- uip/mark.c | 2 -- uip/mhbuild.c | 2 -- uip/mhl.c | 3 --- uip/mhlist.c | 2 -- uip/mhmail.c | 2 -- uip/mhpath.c | 2 -- uip/mhshow.c | 2 -- uip/mhstore.c | 2 -- uip/mhtest.c | 2 -- uip/new.c | 2 -- uip/packf.c | 2 -- uip/pick.c | 2 -- uip/prompter.c | 2 -- uip/rcvdist.c | 2 -- uip/rcvpack.c | 2 -- uip/rcvstore.c | 2 -- uip/refile.c | 2 -- uip/repl.c | 2 -- uip/rmf.c | 2 -- uip/rmm.c | 3 --- uip/scan.c | 2 -- uip/send.c | 3 --- uip/slocal.c | 2 -- uip/sortm.c | 2 -- uip/spost.c | 2 -- uip/whatnow.c | 3 --- 39 files changed, 92 deletions(-) diff --git a/configure.ac b/configure.ac index f757b3f7..2633228c 100644 --- a/configure.ac +++ b/configure.ac @@ -46,17 +46,6 @@ if test x"$enable_nmh_debug" = x"yes"; then enable_debug=yes fi -dnl Do you want to disable use of locale functions -AH_TEMPLATE([LOCALE], -[Undefine if you don't want locale features. By default this is defined.]) -AC_ARG_ENABLE([locale], -AC_HELP_STRING([--disable-locale], [turn off locale features]), -[if test x$enableval = xyes; then - AC_DEFINE(LOCALE) -fi], -AC_DEFINE(LOCALE) -) - dnl What method of locking to use? AC_ARG_WITH(locking, AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@], diff --git a/uip/ali.c b/uip/ali.c index 8effd63d..b5bbfbe3 100644 --- a/uip/ali.c +++ b/uip/ali.c @@ -60,9 +60,7 @@ main(int argc, char **argv) char *vec[NVEC], **arguments; struct aka *ak; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/anno.c b/uip/anno.c index c80b782b..2647d971 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -74,9 +74,7 @@ main(int argc, char **argv) int append = 0; /* append annotations instead of default prepend */ int number = 0; /* delete specific number of like elements if set */ -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); context_read(); diff --git a/uip/ap.c b/uip/ap.c index 9f8e6f0f..c293a532 100644 --- a/uip/ap.c +++ b/uip/ap.c @@ -47,9 +47,7 @@ main(int argc, char **argv) char buf[BUFSIZ], **argp; char **arguments, *addrs[NADDRS]; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/burst.c b/uip/burst.c index 1464cd6e..e657c33f 100644 --- a/uip/burst.c +++ b/uip/burst.c @@ -45,9 +45,7 @@ main(int argc, char **argv) struct smsg *smsgs; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/comp.c b/uip/comp.c index 680c0fc9..4768fc4a 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -41,10 +41,7 @@ main(int argc, char **argv) struct msgs *mp = NULL; char *fmtstr; - -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/dist.c b/uip/dist.c index d00f686f..c1f4f9d3 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -41,9 +41,7 @@ main(int argc, char **argv) struct msgs *mp = NULL; char *fmtstr; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/dp.c b/uip/dp.c index aee4b292..1a91678f 100644 --- a/uip/dp.c +++ b/uip/dp.c @@ -42,9 +42,7 @@ main(int argc, char **argv) char buf[BUFSIZ], **argp, **arguments; char *dates[NDATES]; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/flist.c b/uip/flist.c index 2a002a5d..057d5f4e 100644 --- a/uip/flist.c +++ b/uip/flist.c @@ -118,9 +118,7 @@ main(int argc, char **argv) char **arguments; char buf[BUFSIZ]; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/fmtdump.c b/uip/fmtdump.c index fc94247c..a0e6e140 100644 --- a/uip/fmtdump.c +++ b/uip/fmtdump.c @@ -46,9 +46,7 @@ main(int argc, char **argv) char buf[BUFSIZ], *fmtstr, **argp, **arguments; struct format *fmt; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/folder.c b/uip/folder.c index 34b3d988..8638151e 100644 --- a/uip/folder.c +++ b/uip/folder.c @@ -115,9 +115,7 @@ main(int argc, char **argv) char *cp, *dp, *msg = NULL, *argfolder = NULL; char **ap, **argp, buf[BUFSIZ], **arguments; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/forw.c b/uip/forw.c index b75bd2ee..54b7c074 100644 --- a/uip/forw.c +++ b/uip/forw.c @@ -68,9 +68,7 @@ main(int argc, char **argv) char *fmtstr; int buildsw = 0; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/inc.c b/uip/inc.c index 4b75c6e2..f737d698 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -152,9 +152,7 @@ main(int argc, char **argv) SAVEGROUPPRIVS(); TRYDROPGROUPPRIVS(); -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/mark.c b/uip/mark.c index c1da6445..d4a3729e 100644 --- a/uip/mark.c +++ b/uip/mark.c @@ -56,9 +56,7 @@ main(int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/mhbuild.c b/uip/mhbuild.c index 76626dbb..113ff388 100644 --- a/uip/mhbuild.c +++ b/uip/mhbuild.c @@ -117,9 +117,7 @@ main(int argc, char **argv) done = unlink_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/mhl.c b/uip/mhl.c index 8b29ee4b..18d0176c 100644 --- a/uip/mhl.c +++ b/uip/mhl.c @@ -226,10 +226,7 @@ main(int argc, char **argv) char buf[BUFSIZ], *files[MAXARGS]; char **argp, **arguments; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif - invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/mhlist.c b/uip/mhlist.c index e507127a..c66b7cfe 100644 --- a/uip/mhlist.c +++ b/uip/mhlist.c @@ -94,9 +94,7 @@ main(int argc, char **argv) done=freects_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/mhmail.c b/uip/mhmail.c index a85899de..b3a9acb5 100644 --- a/uip/mhmail.c +++ b/uip/mhmail.c @@ -48,9 +48,7 @@ main(int argc, char **argv) FILE *out; char *tfile = NULL; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* foil search of user profile/context */ diff --git a/uip/mhpath.c b/uip/mhpath.c index 605d13c3..a8de5cb2 100644 --- a/uip/mhpath.c +++ b/uip/mhpath.c @@ -27,9 +27,7 @@ main(int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/mhshow.c b/uip/mhshow.c index e1bcf8f1..0b49b7e8 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -100,9 +100,7 @@ main(int argc, char **argv) done=freects_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); if (mh_strcasecmp(invo_name, "next")==0) { mode = NEXT; diff --git a/uip/mhstore.c b/uip/mhstore.c index b0c08da1..ae812ad3 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -132,9 +132,7 @@ main(int argc, char **argv) done=freects_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/mhtest.c b/uip/mhtest.c index d24694ee..1c1684f4 100644 --- a/uip/mhtest.c +++ b/uip/mhtest.c @@ -97,9 +97,7 @@ main(int argc, char **argv) done=freects_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/new.c b/uip/new.c index 7c3191aa..a79845c0 100644 --- a/uip/new.c +++ b/uip/new.c @@ -435,9 +435,7 @@ main(int argc, char **argv) sequences[0] = NULL; sequences[1] = NULL; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/packf.c b/uip/packf.c index b565c164..763b6e70 100644 --- a/uip/packf.c +++ b/uip/packf.c @@ -30,9 +30,7 @@ main(int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/pick.c b/uip/pick.c index b817a0b8..e94c2593 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -93,9 +93,7 @@ main(int argc, char **argv) done=putzero_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/prompter.c b/uip/prompter.c index e1f0bff8..823760ef 100644 --- a/uip/prompter.c +++ b/uip/prompter.c @@ -57,9 +57,7 @@ main(int argc, char **argv) FILE *in, *out; char *tfile = NULL; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/rcvdist.c b/uip/rcvdist.c index fa2a170b..2ba60977 100644 --- a/uip/rcvdist.c +++ b/uip/rcvdist.c @@ -44,9 +44,7 @@ main(int argc, char **argv) done=unlink_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/rcvpack.c b/uip/rcvpack.c index fe98a449..79c34504 100644 --- a/uip/rcvpack.c +++ b/uip/rcvpack.c @@ -27,9 +27,7 @@ main(int argc, char **argv) char *cp, *file = NULL, buf[BUFSIZ]; char **argp, **arguments; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/rcvstore.c b/uip/rcvstore.c index 8121e2d1..bb14ed98 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -60,9 +60,7 @@ main(int argc, char **argv) done=unlink_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/refile.c b/uip/refile.c index 76384dd4..6c5a8f65 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -57,9 +57,7 @@ main(int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); context_read(); diff --git a/uip/repl.c b/uip/repl.c index 462498e9..9c9e5ce9 100644 --- a/uip/repl.c +++ b/uip/repl.c @@ -143,9 +143,7 @@ main(int argc, char **argv) filter = getcpy(etcpath(mhlreply)); -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/rmf.c b/uip/rmf.c index 9d207522..05b3e962 100644 --- a/uip/rmf.c +++ b/uip/rmf.c @@ -34,9 +34,7 @@ main(int argc, char **argv) char *cp, *folder = NULL, newfolder[BUFSIZ]; char buf[BUFSIZ], **argp, **arguments; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/rmm.c b/uip/rmm.c index 0aab0ba0..51be03a9 100644 --- a/uip/rmm.c +++ b/uip/rmm.c @@ -33,10 +33,7 @@ main(int argc, char **argv) struct msgs *mp; pid_t pid; - -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); context_read(); diff --git a/uip/scan.c b/uip/scan.c index 269193ff..ba90e401 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -41,9 +41,7 @@ main(int argc, char **argv) struct msgs *mp; FILE *in; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/send.c b/uip/send.c index 06058e86..bcbd54dd 100644 --- a/uip/send.c +++ b/uip/send.c @@ -88,10 +88,7 @@ main(int argc, char **argv) struct stat st; struct stat st2; - -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/slocal.c b/uip/slocal.c index ec788e31..9d468025 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -174,9 +174,7 @@ main(int argc, char **argv) char mailbox[BUFSIZ], tmpfil[BUFSIZ]; char **argp, **arguments; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(*argv); /* foil search of user profile/context */ diff --git a/uip/sortm.c b/uip/sortm.c index 4cd999d8..ed091815 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -73,9 +73,7 @@ main(int argc, char **argv) struct msgs *mp; struct smsg **dlist; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ diff --git a/uip/spost.c b/uip/spost.c index 4384bc4c..4c1210ba 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -147,9 +147,7 @@ main(int argc, char **argv) char *sargv[16], buf[BUFSIZ], name[NAMESZ]; FILE *in; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* foil search of user profile/context */ diff --git a/uip/whatnow.c b/uip/whatnow.c index ead1bd5c..bbb468da 100644 --- a/uip/whatnow.c +++ b/uip/whatnow.c @@ -117,10 +117,7 @@ main(int argc, char **argv) FILE *f; /* read pointer for bgnd proc */ int n; /* set on -n to detach command */ -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif - invo_name = mhbasename(argv[0]); /* read user profile/context */ -- 2.39.5