From: Ken Hornstein Date: Mon, 20 Jan 2014 04:21:32 +0000 (-0500) Subject: Remove the --disable-locale configure option and make locale support X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/9cf9f118998a7635485e13863d1bc16c1486bb05?ds=inline;hp=--cc Remove the --disable-locale configure option and make locale support unconditional. --- 9cf9f118998a7635485e13863d1bc16c1486bb05 diff --git a/configure.ac b/configure.ac index 61a8beb2..35fc7810 100644 --- a/configure.ac +++ b/configure.ac @@ -28,14 +28,6 @@ dnl Do you want to debug nmh? AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug],[enable nmh code debugging])) -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], - [AS_HELP_STRING([--disable-locale], [turn off locale features])], - [AS_IF([test x$enableval = xyes], [AC_DEFINE(LOCALE)])], - [AC_DEFINE(LOCALE)]) - dnl Do you want client-side support for using SASL for authentication? dnl Note that this code will be enabled for both POP and SMTP AC_ARG_WITH([cyrus-sasl], AS_HELP_STRING([--with-cyrus-sasl], diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c index 75adc08e..970e71e5 100644 --- a/sbr/fmt_compile.c +++ b/sbr/fmt_compile.c @@ -364,11 +364,7 @@ compile_error(char *str, char *cp) usr_fstring[errpos] = '\0'; for (i = errpos-errctx; i < errpos; i++) { -#ifdef LOCALE if (iscntrl((unsigned char) usr_fstring[i])) -#else - if (usr_fstring[i] < 32) -#endif usr_fstring[i] = '_'; } diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c index 9b84861c..e4d79d57 100644 --- a/sbr/fmt_scan.c +++ b/sbr/fmt_scan.c @@ -47,7 +47,6 @@ match (char *str, char *sub) int c1, c2; char *s1, *s2; -#ifdef LOCALE while ((c1 = *sub)) { c1 = (isascii((unsigned char) c1) && isalpha((unsigned char) c1) && isupper((unsigned char) c1)) ? tolower((unsigned char) c1) : c1; @@ -71,19 +70,6 @@ match (char *str, char *sub) if (! c1) return 1; } -#else - while ((c1 = *sub)) { - while ((c2 = *str++) && (c1 | 040) != (c2 | 040)) - ; - if (! c2) - return 0; - s1 = sub + 1; s2 = str; - while ((c1 = *s1++) && (c1 | 040) == (*s2++ | 040)) - ; - if (! c1) - return 1; - } -#endif return 1; } diff --git a/sbr/gans.c b/sbr/gans.c index 6b76b7ba..70234029 100644 --- a/sbr/gans.c +++ b/sbr/gans.c @@ -26,12 +26,7 @@ gans (char *prompt, struct swit *ansp) if (i == EOF) return 0; if (cp < &ansbuf[sizeof ansbuf - 1]) { -#ifdef LOCALE i = (isalpha(i) && isupper(i)) ? tolower(i) : i; -#else - if (i >= 'A' && i <= 'Z') - i += 'a' - 'A'; -#endif *cp++ = i; } } diff --git a/sbr/m_atoi.c b/sbr/m_atoi.c index f05271f7..da6730df 100644 --- a/sbr/m_atoi.c +++ b/sbr/m_atoi.c @@ -19,11 +19,7 @@ m_atoi (char *str) char *cp; for (i = 0, cp = str; *cp; cp++) { -#ifdef LOCALE if (!isdigit((unsigned char) *cp)) -#else - if (*cp < '0' || *cp > '9') -#endif return 0; i *= 10; diff --git a/sbr/m_convert.c b/sbr/m_convert.c index 62268fbf..d7080065 100644 --- a/sbr/m_convert.c +++ b/sbr/m_convert.c @@ -286,14 +286,9 @@ m_conv (struct msgs *mp, char *str, int call) return BADNUM; } -#ifdef LOCALE /* doesn't enforce lower case */ for (bp = buf; (isalpha((unsigned char) *cp) || *cp == '.') && (bp - buf < (int) sizeof(buf) - 1); ) -#else - for (bp = buf; ((*cp >= 'a' && *cp <= 'z') || *cp == '.') - && (bp - buf < (int) sizeof(buf) - 1); ) -#endif /* LOCALE */ { *bp++ = *cp++; } diff --git a/sbr/uprf.c b/sbr/uprf.c index 5da5e765..500b036d 100644 --- a/sbr/uprf.c +++ b/sbr/uprf.c @@ -9,11 +9,6 @@ #include -#ifndef LOCALE -# define TO_LOWER 040 -# define NO_MASK 000 -#endif - int uprf (char *c1, char *c2) @@ -25,16 +20,11 @@ uprf (char *c1, char *c2) while ((c = *c2++)) { -#ifdef LOCALE c &= 0xff; mask = *c1 & 0xff; c = (isalpha(c) && isupper(c)) ? tolower(c) : c; mask = (isalpha(mask) && isupper(mask)) ? tolower(mask) : mask; if (c != mask) -#else - mask = (isalpha(c) && isalpha(*c1)) ? TO_LOWER : NO_MASK; - if ((c | mask) != (*c1 | mask)) -#endif return 0; else c1++; diff --git a/uip/ali.c b/uip/ali.c index dda0a2c1..534c25d8 100644 --- a/uip/ali.c +++ b/uip/ali.c @@ -53,9 +53,7 @@ main (int argc, char **argv) char **vec = mh_xmalloc (argc * sizeof (char *)), **arguments; struct aka *ak; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/anno.c b/uip/anno.c index d18713ae..75bcc682 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -94,9 +94,7 @@ main (int argc, char **argv) int list = 0; /* list header elements if set */ int number = 0; /* delete specific number of like elements if set */ -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/ap.c b/uip/ap.c index f0b0baa9..a8f9169f 100644 --- a/uip/ap.c +++ b/uip/ap.c @@ -53,9 +53,7 @@ main (int argc, char **argv) char buf[BUFSIZ], **argp; char **arguments, *addrs[NADDRS]; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/burst.c b/uip/burst.c index 34ef10b0..e838422b 100644 --- a/uip/burst.c +++ b/uip/burst.c @@ -75,9 +75,7 @@ main (int argc, char **argv) struct smsg *smsgs; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/comp.c b/uip/comp.c index 08507299..a7300c34 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -83,9 +83,7 @@ main (int argc, char **argv) struct format *fmt; struct stat st; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/conflict.c b/uip/conflict.c index a43c70ee..9174a39b 100644 --- a/uip/conflict.c +++ b/uip/conflict.c @@ -68,9 +68,7 @@ main (int argc, char **argv) char *cp, **argp, **arguments; char buf[BUFSIZ], *akv[50]; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* foil search of user profile/context */ diff --git a/uip/dist.c b/uip/dist.c index d3ceaec2..00503be5 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -83,9 +83,7 @@ main (int argc, char **argv) struct msgs *mp = NULL; struct stat st; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/dp.c b/uip/dp.c index 67eef061..8245f60a 100644 --- a/uip/dp.c +++ b/uip/dp.c @@ -51,9 +51,7 @@ main (int argc, char **argv) char buf[BUFSIZ], **argp, **arguments; char *dates[NDATES]; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/flist.c b/uip/flist.c index fe3dcebd..cea1ca7c 100644 --- a/uip/flist.c +++ b/uip/flist.c @@ -115,9 +115,7 @@ main(int argc, char **argv) char **arguments; char buf[BUFSIZ]; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex(argv[0], '/'); /* read user profile/context */ diff --git a/uip/fmtdump.c b/uip/fmtdump.c index 65358168..289f1e66 100644 --- a/uip/fmtdump.c +++ b/uip/fmtdump.c @@ -51,9 +51,7 @@ main (int argc, char **argv) char buf[BUFSIZ], *nfs, **argp, **arguments; struct format *fmt; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/fmttest.c b/uip/fmttest.c index b39d0d52..a3a436f4 100644 --- a/uip/fmttest.c +++ b/uip/fmttest.c @@ -121,9 +121,7 @@ main (int argc, char **argv) int dat[5]; struct fmt_callbacks cb, *cbp = NULL; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/folder.c b/uip/folder.c index 9fa29840..a2e6a4a8 100644 --- a/uip/folder.c +++ b/uip/folder.c @@ -101,9 +101,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 = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/forw.c b/uip/forw.c index 45fb740f..9eeb6123 100644 --- a/uip/forw.c +++ b/uip/forw.c @@ -119,9 +119,7 @@ main (int argc, char **argv) int buildsw = 0; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/inc.c b/uip/inc.c index 0e527442..3aa5e50f 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -197,9 +197,7 @@ main (int argc, char **argv) SAVEGROUPPRIVS(); TRYDROPGROUPPRIVS(); -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/install-mh.c b/uip/install-mh.c index 2921d261..0fc97c45 100644 --- a/uip/install-mh.c +++ b/uip/install-mh.c @@ -42,9 +42,7 @@ main (int argc, char **argv) FILE *in, *out; int check; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); arguments = getarguments (invo_name, argc, argv, 0); argp = arguments; diff --git a/uip/mark.c b/uip/mark.c index f0f3d7a6..439ea407 100644 --- a/uip/mark.c +++ b/uip/mark.c @@ -52,9 +52,7 @@ main (int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/mhbuild.c b/uip/mhbuild.c index 18844b56..0af3c56f 100644 --- a/uip/mhbuild.c +++ b/uip/mhbuild.c @@ -115,9 +115,7 @@ main (int argc, char **argv) done=unlink_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index fd777699..bafd78e2 100644 --- a/uip/mhfixmsg.c +++ b/uip/mhfixmsg.c @@ -137,9 +137,7 @@ main (int argc, char **argv) { done = freects_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/mhl.c b/uip/mhl.c index af4cdfa8..d4c5308b 100644 --- a/uip/mhl.c +++ b/uip/mhl.c @@ -13,9 +13,7 @@ int main (int argc, char **argv) { -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif done (mhl (argc, argv)); return 1; } diff --git a/uip/mhlist.c b/uip/mhlist.c index f6208ddb..70924348 100644 --- a/uip/mhlist.c +++ b/uip/mhlist.c @@ -109,9 +109,7 @@ main (int argc, char **argv) done=freects_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/mhn.c b/uip/mhn.c index b2db3070..06aeee53 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -169,9 +169,7 @@ main (int argc, char **argv) done=freects_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/mhpath.c b/uip/mhpath.c index 3a0a628b..29b59f4a 100644 --- a/uip/mhpath.c +++ b/uip/mhpath.c @@ -32,9 +32,7 @@ main(int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/mhshow.c b/uip/mhshow.c index 94e5e064..f19f9a9d 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -119,9 +119,7 @@ main (int argc, char **argv) done=freects_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/mhstore.c b/uip/mhstore.c index 79f335e5..fff480ae 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -108,9 +108,7 @@ main (int argc, char **argv) done=freects_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/mhtest.c b/uip/mhtest.c index 49d2a981..092b542a 100644 --- a/uip/mhtest.c +++ b/uip/mhtest.c @@ -104,9 +104,7 @@ main (int argc, char **argv) done=freects_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/msgchk.c b/uip/msgchk.c index 76bb37d8..39a2918d 100644 --- a/uip/msgchk.c +++ b/uip/msgchk.c @@ -85,9 +85,7 @@ main (int argc, char **argv) char **argp, **arguments, *vec[MAXVEC]; struct passwd *pw; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/msh.c b/uip/msh.c index 2fb2b230..75371bad 100644 --- a/uip/msh.c +++ b/uip/msh.c @@ -203,9 +203,7 @@ main (int argc, char **argv) char *cp, *file = NULL, *folder = NULL; char **argp, **arguments, buf[BUFSIZ]; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/new.c b/uip/new.c index 74d4d512..59b5b8cf 100644 --- a/uip/new.c +++ b/uip/new.c @@ -422,9 +422,7 @@ main(int argc, char **argv) char *unseen; struct node *folder; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex(argv[0], '/'); /* read user profile/context */ diff --git a/uip/packf.c b/uip/packf.c index f070f48d..6f951914 100644 --- a/uip/packf.c +++ b/uip/packf.c @@ -48,9 +48,7 @@ main (int argc, char **argv) done=mbxclose_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/pick.c b/uip/pick.c index 5f280243..a9159208 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -68,9 +68,7 @@ main (int argc, char **argv) done=putzero_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/post.c b/uip/post.c index 85894635..f6e14fb4 100644 --- a/uip/post.c +++ b/uip/post.c @@ -283,9 +283,7 @@ main (int argc, char **argv) FILE *in, *out; m_getfld_state_t gstate = 0; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* foil search of user profile/context */ diff --git a/uip/prompter.c b/uip/prompter.c index afa81f5f..7923e84b 100644 --- a/uip/prompter.c +++ b/uip/prompter.c @@ -78,9 +78,7 @@ main (int argc, char **argv) char *tmpfil; m_getfld_state_t gstate = 0; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/rcvdist.c b/uip/rcvdist.c index 6cc8e277..8b672cd7 100644 --- a/uip/rcvdist.c +++ b/uip/rcvdist.c @@ -50,9 +50,7 @@ main (int argc, char **argv) done=unlink_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/rcvpack.c b/uip/rcvpack.c index 4725f26c..08e21b9c 100644 --- a/uip/rcvpack.c +++ b/uip/rcvpack.c @@ -40,9 +40,7 @@ main (int argc, char **argv) char *cp, *file = NULL, buf[BUFSIZ]; char **argp, **arguments; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/rcvstore.c b/uip/rcvstore.c index 2822093e..98f17503 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -56,9 +56,7 @@ main (int argc, char **argv) done=unlink_done; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/rcvtty.c b/uip/rcvtty.c index 356234ad..447c6e40 100644 --- a/uip/rcvtty.c +++ b/uip/rcvtty.c @@ -81,9 +81,8 @@ main (int argc, char **argv) char *cp, *user, buf[BUFSIZ], tty[BUFSIZ]; char **argp, **arguments, *vec[MAXARGS]; struct utmpx *utp; -#ifdef LOCALE + setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/refile.c b/uip/refile.c index 19e12661..776c6fdf 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -68,9 +68,7 @@ main (int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/repl.c b/uip/repl.c index 84374569..d1c8ebfa 100644 --- a/uip/repl.c +++ b/uip/repl.c @@ -129,9 +129,7 @@ main (int argc, char **argv) int buildsw = 0; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/rmf.c b/uip/rmf.c index 9e922475..735cf774 100644 --- a/uip/rmf.c +++ b/uip/rmf.c @@ -37,9 +37,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 = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/rmm.c b/uip/rmm.c index ee602b45..8882b8f6 100644 --- a/uip/rmm.c +++ b/uip/rmm.c @@ -37,9 +37,7 @@ main (int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/scan.c b/uip/scan.c index 1f487cdd..31309220 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -52,9 +52,7 @@ main (int argc, char **argv) struct msgs *mp; FILE *in; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/send.c b/uip/send.c index e7ca7157..be5dc793 100644 --- a/uip/send.c +++ b/uip/send.c @@ -120,9 +120,7 @@ main (int argc, char **argv) char *attach = NMH_ATTACH_HEADER; /* header field name for attachments */ int attachformat = 1; /* mhbuild format specifier for attachments */ -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/show.c b/uip/show.c index 5a912f6b..14d41911 100644 --- a/uip/show.c +++ b/uip/show.c @@ -61,9 +61,7 @@ main (int argc, char **argv) struct msgs_array msgs = { 0, 0, NULL }; struct msgs_array vec = { 0, 0, NULL }; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/slocal.c b/uip/slocal.c index 8daf6081..8dace059 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -188,9 +188,7 @@ main (int argc, char **argv) char mailbox[BUFSIZ], tmpfil[BUFSIZ]; char **argp, **arguments; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (*argv, '/'); /* foil search of user profile/context */ diff --git a/uip/sortm.c b/uip/sortm.c index 72fe0659..f6a66f16 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -78,9 +78,7 @@ main (int argc, char **argv) struct smsg **dlist; int checksw = 0; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */ diff --git a/uip/viamail.c b/uip/viamail.c index 7c81079d..39ccf509 100644 --- a/uip/viamail.c +++ b/uip/viamail.c @@ -58,9 +58,7 @@ main (int argc, char **argv) char *cp, buf[BUFSIZ]; char **argp, **arguments; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* foil search of user profile/context */ diff --git a/uip/whatnow.c b/uip/whatnow.c index be50bc92..4950514e 100644 --- a/uip/whatnow.c +++ b/uip/whatnow.c @@ -13,8 +13,6 @@ int main (int argc, char **argv) { -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif return WhatNow (argc, argv); } diff --git a/uip/whom.c b/uip/whom.c index eca3946d..8973c762 100644 --- a/uip/whom.c +++ b/uip/whom.c @@ -63,9 +63,7 @@ main (int argc, char **argv) char *msg = NULL, **ap, **argp, backup[BUFSIZ]; char buf[BUFSIZ], **arguments, *vec[MAXARGS]; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = r1bindex (argv[0], '/'); /* read user profile/context */