remove stuff defined in POSIX:2001

Headers:
    locale.h
    sys/time.h
    sys/resource.h
    sys/select.h

Header checks:
    HAVE_FTRUNCATE
    HAVE_INTTYPES_H
    HAVE_ISWBLANK
    HAVE_LOCALE_H
    HAVE_SETRLIMIT
    HAVE_SYS_RESOURCE_H
    HAVE_SYS_SELECT_H
    HAVE_SYS_TIME_H

Functions:
    getopt
    getsid
    setegid
    setenv
    setrlimit
    strcasecmp
    strdup
    strftime
    strncasecmp
    strtok_r
    fseeko

Types:
    pid_t
    ssize_t
    socklen_t

diff --git a/configure.ac b/configure.ac
index bd29fdb32a641a4e87191de8d4d5a9e86b80a1d6..bfa8fccdca5406a689320318d22eeeed970cc444 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,6 @@ AC_CHECK_TOOL(AR, ar, ar)
 AC_C_BIGENDIAN
 
 AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
 AC_CHECK_SIZEOF(off_t)
 
 AC_PATH_PROG(DBX, dbx, no)
@@ -96,26 +95,11 @@ AH_TEMPLATE([ICONV_NONTRANS],
        all return values other than (size_t)(-1) as equivalent.])
 
 AH_BOTTOM([/* fseeko portability defines */
-#ifdef HAVE_FSEEKO
-# define LOFF_T off_t
-# if HAVE_C99_INTTYPES && HAVE_INTTYPES_H
-#  if SIZEOF_OFF_T == 8
-#   define OFF_T_FMT "%" PRId64
-#  else
-#   define OFF_T_FMT "%" PRId32
-#  endif
-# else
-#  if (SIZEOF_OFF_T == 8) && (SIZEOF_LONG == 4)
-#   define OFF_T_FMT "%lld"
-#  else
-#   define OFF_T_FMT "%ld"
-#  endif
-# endif
+#define LOFF_T off_t
+#if SIZEOF_OFF_T == 8
+# define OFF_T_FMT "%" PRId64
 #else
-# define LOFF_T long
-# define fseeko fseek
-# define ftello ftell
-# define OFF_T_FMT "%ld"
+# define OFF_T_FMT "%" PRId32
 #endif
 ])
 
@@ -449,11 +433,10 @@ main ()
 AC_HEADER_STDC
 
 AC_CHECK_HEADERS(sys/ioctl.h ioctl.h sysexits.h)
-AC_CHECK_HEADERS(sys/time.h sys/resource.h sys/syscall.h)
+AC_CHECK_HEADERS(sys/syscall.h)
 
-AC_CHECK_FUNCS(setrlimit getsid)
 AC_CHECK_FUNCS(fgets_unlocked fgetc_unlocked)
-AC_CHECK_FUNCS(strcasecmp strncasecmp setenv strdup strsep strtok_r mkdtemp)
+AC_CHECK_FUNCS(strsep mkdtemp)
 
 AC_MSG_CHECKING(for sig_atomic_t in signal.h)
 AC_EGREP_HEADER(volatile.*sig_atomic_t,signal.h,
@@ -473,30 +456,13 @@ AC_CHECK_DECLS([sys_siglist],[],[],[#include <signal.h>
 ])
 
 
-AC_TYPE_PID_T
-AC_CHECK_TYPE(ssize_t, int)
-
-AC_CHECK_FUNCS(setegid)
-
 AC_REPLACE_FUNCS([wcscasecmp strcasestr])
 
-AC_CHECK_FUNC(getopt)
-if test $ac_cv_func_getopt = yes; then
-       AC_CHECK_HEADERS(getopt.h)
-fi
-
-dnl SCO uses chsize() instead of ftruncate()
-AC_CHECK_FUNCS(ftruncate, , [AC_CHECK_LIB(x, chsize)])
-
-dnl SCO has strftime() in libintl
-AC_CHECK_FUNCS(strftime, , [AC_CHECK_LIB(intl, strftime)])
+AC_CHECK_HEADERS(getopt.h)
 
 dnl Set the atime of files
 AC_CHECK_FUNCS(futimens)
 
-dnl AIX may not have fchdir()
-AC_CHECK_FUNCS(fchdir, , [mutt_cv_fchdir=no])
-
 AC_ARG_WITH(homespool,
        AS_HELP_STRING([--with-homespool@<:@=FILE@:>@],[File in user's directory where new mail is spooled]), with_homespool=${withval})
 if test x$with_homespool != x; then
@@ -664,12 +630,6 @@ fi
 dnl -- end socket dependencies --
 
 if test "$need_socket" = "yes"; then
-       AC_CHECK_HEADERS([sys/select.h])
-       AC_MSG_CHECKING([for socklen_t])
-       AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]),
-               AC_MSG_RESULT([no])
-               AC_DEFINE(socklen_t,int,
-                       [ Define to 'int' if <sys/socket.h> doesn't have it. ]))
        AC_DEFINE(USE_SOCKET,1,
                [ Include code for socket support. Set automatically if you enable POP3 or IMAP ])
        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS account.o mutt_socket.o mutt_tunnel.o"
@@ -1116,7 +1076,6 @@ dnl -- iconv/gettext --
 
 AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT([external])
-AC_CHECK_HEADERS([locale.h])
 
 AM_ICONV
 if test "$am_cv_func_iconv" != yes; then

diff --git a/crypt.c b/crypt.c
index e8981785ed31d089490bc0022a869e2ea2fecede..b4af13ed3a6ac350b8aa94ccde6a0a29b30a6b55 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -23,9 +23,12 @@
 #include "config.h"
 #include <ctype.h>
 #include <errno.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include "mutt.h"
@@ -33,15 +36,6 @@
 #include "mime.h"
 #include "mutt_crypt.h"
 #include "mutt_curses.h"
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
 
 
 /* print the current time to avoid spoofing of the signature output */
@@ -79,7 +73,7 @@ void crypt_forget_passphrase(void)
 }
 
 
-#if defined(HAVE_SETRLIMIT) && (!defined(DEBUG))
+#if (!defined(DEBUG))
 
 static void disable_coredumps(void)
 {
@@ -93,14 +87,14 @@ static void disable_coredumps(void)
   }
 }
 
-#endif /* HAVE_SETRLIMIT */
+#endif
 
 
 int crypt_valid_passphrase(int flags)
 {
   int ret = 0;
 
-#if defined(HAVE_SETRLIMIT) && (!defined(DEBUG))
+#if !defined(DEBUG)
   disable_coredumps();
 #endif
 

diff --git a/crypt_gpgme.c b/crypt_gpgme.c
index 9ae33cfcfcbd90bdca967de776d00c5caeaf2568..70d702cfb473a5f2d0c0758a14d2f3be5c8c59f7 100644 (file)
--- a/crypt_gpgme.c
+++ b/crypt_gpgme.c
@@ -27,9 +27,12 @@
 #include <errno.h>
 #include <gpgme.h>
 #include <langinfo.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include "mutt.h"
@@ -40,15 +43,6 @@
 #include "mutt_menu.h"
 #include "pager.h"
 #include "sort.h"
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
 
 #define PKA_NOTATION_NAME "pka-address@gnupg.org"
 #define is_pka_notation(notation)                                              \

diff --git a/curs_lib.c b/curs_lib.c
index 2576c5683288108063a488420faeead194cc2b7d..0ef72c6bd5eb3de6acda2955d87f46b12172802a 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -23,6 +23,7 @@
 #include <langinfo.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <termios.h>
 #include <time.h>
@@ -32,9 +33,6 @@
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "pager.h"
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_ISWBLANK
 #include <wctype.h>
 #endif
@@ -313,15 +311,12 @@ int mutt_yesorno(const char *msg, int def)
     }
 
     answer[0] = ch.ch;
-    if (reyes_ok ? (regexec(&reyes, answer, 0, 0, 0) == 0) :
-                   (tolower(ch.ch) == 'y'))
+    if (reyes_ok ? (regexec(&reyes, answer, 0, 0, 0) == 0) : (tolower(ch.ch) == 'y'))
     {
       def = MUTT_YES;
       break;
     }
-    else if (
-        reno_ok ? (regexec(&reno, answer, 0, 0, 0) == 0) :
-                  (tolower(ch.ch) == 'n'))
+    else if (reno_ok ? (regexec(&reno, answer, 0, 0, 0) == 0) : (tolower(ch.ch) == 'n'))
     {
       def = MUTT_NO;
       break;

diff --git a/hcache.c b/hcache.c
index d6af016547921e99731b09c30f6703b6f6591b10..5083311781c1fe107a346aad1286a675250668d1 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -26,13 +26,11 @@
 #endif
 
 #include <errno.h>
+#include <sys/time.h>
 #include "hcache.h"
 #include "hcache_backend.h"
 #include "hcversion.h"
 #include "md5.h"
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 
 static unsigned int hcachever = 0x0;
 

diff --git a/mh.c b/mh.c
index 25e6aaf6ba545f9ab2dc9883287a99fcb6607d8e..f26e16857881ee2c919dffadb1e454b6301f4a72 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <utime.h>
@@ -42,9 +43,6 @@
 #include "mutt_curses.h"
 #include "mx.h"
 #include "sort.h"
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"
 #endif

diff --git a/mutt_socket.c b/mutt_socket.c
index be9b2875562a15b61b96eba8457b1c24e6f08174..92897352d0485deb7f4c73de937187628c226cd7 100644 (file)
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -25,15 +25,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include "mutt.h"
-#include "mutt_socket.h"
 #include "mutt_idna.h"
+#include "mutt_socket.h"
 #include "mutt_tunnel.h"
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif

diff --git a/pgp.c b/pgp.c
index 95c3987a3f885fa0b4d82a8f421907701fc72075..9924a6901d1b7531f48d0e92ddd7bb85fe1a7bc5 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -28,9 +28,12 @@
 #include "config.h"
 #include <ctype.h>
 #include <errno.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include "mutt.h"
@@ -39,18 +42,8 @@
 #include "filter.h"
 #include "mime.h"
 #include "mutt_crypt.h"
-#include "mutt_crypt.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
 
 
 char PgpPass[LONG_STRING];

diff --git a/protos.h b/protos.h
index 66a9b058b96ddf698ffbdf272b168772249ce30a..dc9ecca71a478c24452046a6050af04d1a754a10 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -450,11 +450,6 @@ int getdnsdomainname(char *, size_t);
 #define SCO
 #endif
 
-/* SCO Unix uses chsize() instead of ftruncate() */
-#ifndef HAVE_FTRUNCATE
-#define ftruncate chsize
-#endif
-
 #ifdef _AIX
 int setegid(gid_t);
 #endif /* _AIX */

diff --git a/smime.c b/smime.c
index 67c8e08e0ad5a4cd8f66ea1d1bbec19bb5b99d5e..66ad74be31ae7f07fd49ad64db0bf0c36cb7e08a 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -20,9 +20,11 @@
 #include "config.h"
 #include <ctype.h>
 #include <errno.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include "mutt.h"
@@ -33,15 +35,6 @@
 #include "mutt_crypt.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
 
 struct smime_command_context
 {