and even less very old hacks.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/configure.ac b/configure.ac
index 1e879fd..f500375 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -609,19 +609,19 @@ AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain n
 )
 
 if test "x$with_idn" != "xno"; then
-   AC_CHECK_LIB(idn, stringprep_check_version)
-   AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z)
-   AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z)
-   AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale)
+    AC_CHECK_LIB(idn, stringprep_check_version)
+    AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z)
+    AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z)
+    AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale)
 fi
 
 dnl -- end socket --
 
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support]),
-        [ if test x$enableval = xyes ; then
-                AC_DEFINE(DEBUG,1,[ Define to enable debugging info. ])
-          fi
-         ])
+    [ if test x$enableval = xyes ; then
+            AC_DEFINE(DEBUG,1,[ Define to enable debugging info. ])
+      fi
+     ])
 
 AC_ARG_ENABLE(flock, AC_HELP_STRING([--enable-flock], [Use flock() to lock files]),
         [if test $enableval = yes; then
@@ -650,20 +650,6 @@ AC_ARG_ENABLE(buffy-size, AC_HELP_STRING([--enable-buffy-size], [Use file size a
                 AC_DEFINE(BUFFY_SIZE,1,[ Define to enable the "buffy_size" feature. ])
         fi])
 
-AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable ]),
-        [if test x$enableval = xyes; then
-                AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
-        fi])
-
-AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]),
-        [if test $withval != yes; then
-                AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
-                 [program to use for shell commands])
-         else
-                AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")
-        fi],
-        [AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")])
-
 dnl -- start cache --
 AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]),
 [if test x$enableval = xyes; then

diff --git a/filter.c b/filter.c
index 952618f..530f16f 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -93,7 +93,7 @@ mutt_create_filter_fd (const char *cmd, FILE ** in, FILE ** out, FILE ** err,
       close (fderr);
     }
 
-    execl (EXECSHELL, "sh", "-c", cmd, NULL);
+    execl ("/bin/sh", "sh", "-c", cmd, NULL);
     _exit (127);
   }
   else if (thepid == -1) {

diff --git a/init.c b/init.c
index 29e6c5f..1c32270 100644 (file)
--- a/init.c
+++ b/init.c
@@ -2731,14 +2731,11 @@ void mutt_init (int skip_sys_rc, LIST * commands)
 
   CurrentMenu = MENU_MAIN;
 
-
-#ifndef LOCALES_HACK
   /* Do we have a locale definition? */
   if (((p = getenv ("LC_ALL")) != NULL && p[0]) ||
       ((p = getenv ("LANG")) != NULL && p[0]) ||
       ((p = getenv ("LC_CTYPE")) != NULL && p[0]))
     set_option (OPTLOCALES);
-#endif
 
 #ifdef HAVE_GETSID
   /* Unset suspend by default if we're the session leader */

diff --git a/main.c b/main.c
index 8b3bcb7..06a8a6f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -408,11 +408,6 @@ static void show_version (void)
 #else
          "-ENABLE_NLS  "
 #endif
-#ifdef LOCALES_HACK
-         "+LOCALES_HACK  "
-#else
-         "-LOCALES_HACK  "
-#endif
 #ifdef HAVE_WC_FUNCS
          "+HAVE_WC_FUNCS  "
 #else
@@ -469,7 +464,6 @@ static void show_version (void)
   printf ("  +PKGDATADIR=\"%s\"\n", PKGDATADIR);
   printf ("  +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
   printf ("  +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
-  printf ("  +EXECSHELL=\"%s\"\n", EXECSHELL);
 #ifdef MIXMASTER
   printf ("  +MIXMASTER=\"%s\"\n\n", MIXMASTER);
 #else

diff --git a/mutt_tunnel.c b/mutt_tunnel.c
index 92fcea5..a37fa11 100644 (file)
--- a/mutt_tunnel.c
+++ b/mutt_tunnel.c
@@ -88,7 +88,7 @@ static int tunnel_socket_open (CONNECTION * conn)
     /* Don't let the subprocess think it can use the controlling tty */
     setsid ();
 
-    execl (EXECSHELL, "sh", "-c", Tunnel, NULL);
+    execl ("/bin/sh", "sh", "-c", Tunnel, NULL);
     _exit (127);
   }
   mutt_unblock_signals_system (1);

diff --git a/protos.h b/protos.h
index 4b18418..24e5c0d 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -305,17 +305,11 @@ int mutt_from_base64 (char *, const char *);
 /* utf8.c */
 int mutt_wctoutf8 (char *s, unsigned int c);
 
-#ifdef LOCALES_HACK
-#define IsPrint(c) (isprint((unsigned char)(c)) || \
-       ((unsigned char)(c) >= 0xa0))
-#define IsWPrint(wc) (iswprint(wc) || wc >= 0xa0)
-#else
 #define IsPrint(c) (isprint((unsigned char)(c)) || \
        (option (OPTLOCALES) ? 0 : \
        ((unsigned char)(c) >= 0xa0)))
 #define IsWPrint(wc) (iswprint(wc) || \
        (option (OPTLOCALES) ? 0 : (wc >= 0xa0)))
-#endif
 
 #define new_pattern() p_new(pattern_t, 1)
 

diff --git a/system.c b/system.c
index c9612f6..af915de 100644 (file)
--- a/system.c
+++ b/system.c
@@ -100,7 +100,7 @@ int _mutt_system (const char *cmd, int flags)
     sigaction (SIGTSTP, &act, NULL);
     sigaction (SIGCONT, &act, NULL);
 
-    execl (EXECSHELL, "sh", "-c", cmd, NULL);
+    execl ("/bin/sh", "sh", "-c", cmd, NULL);
     _exit (127);                /* execl error */
   }
   else if (thepid != -1) {