To: vim-dev@vim.org

Subject: Patch 7.2.413

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.2.413

Problem:    Large file support is incorrect.

Solution:   Add AC_SYS_LARGEFILE to configure. (James Vega)

Files:      src/configure.in, src/config.h.in, src/auto/configure

*** ../vim-7.2.412/src/configure.in	2010-03-10 16:27:27.000000000 +0100

--- src/configure.in	2010-04-01 15:06:04.000000000 +0200

***************

*** 2669,2674 ****

--- 2669,2678 ----

  	usleep utime utimes)

  AC_FUNC_FSEEKO

+ dnl define _LARGE_FILES, _FILE_OFFSET_BITS and _LARGEFILE_SOURCE when

+ dnl appropriate, so that off_t is 64 bits when needed.

+ AC_SYS_LARGEFILE

+ 

  dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible

  AC_MSG_CHECKING(for st_blksize)

  AC_TRY_COMPILE(

*** ../vim-7.2.412/src/config.h.in	2010-02-24 14:46:58.000000000 +0100

--- src/config.h.in	2010-04-01 15:10:49.000000000 +0200

***************

*** 196,201 ****

--- 196,206 ----

  #undef HAVE_UTIME

  #undef HAVE_BIND_TEXTDOMAIN_CODESET

+ /* Define, if needed, for accessing large files. */

+ #undef _LARGE_FILES

+ #undef _FILE_OFFSET_BITS

+ #undef _LARGEFILE_SOURCE

+ 

  /* Define if you do not have utime(), but do have the utimes() function. */

  #undef HAVE_UTIMES

*** ../vim-7.2.412/src/auto/configure	2010-03-10 16:27:27.000000000 +0100

--- src/auto/configure	2010-05-07 16:01:08.000000000 +0200

***************

*** 821,826 ****

--- 821,827 ----

  with_gnome

  with_motif_lib

  with_tlib

+ enable_largefile

  enable_acl

  enable_gpm

  enable_sysmouse

***************

*** 1485,1490 ****

--- 1486,1492 ----

    --enable-nextaw-check   If auto-select GUI, check for neXtaw default=yes

    --enable-carbon-check   If auto-select GUI, check for Carbon default=yes

    --disable-gtktest       Do not try to compile and run a test GTK program

+   --disable-largefile     omit support for large files

    --disable-acl           Don't check for ACL support.

    --disable-gpm           Don't use gpm (Linux mouse daemon).

    --disable-sysmouse    Don't use sysmouse (mouse in *BSD console).

***************

*** 14345,14350 ****

--- 14347,14709 ----

  fi

+ # Check whether --enable-largefile was given.

+ if test "${enable_largefile+set}" = set; then

+   enableval=$enable_largefile;

+ fi

+ 

+ if test "$enable_largefile" != no; then

+ 

+   { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5

+ $as_echo_n "checking for special C compiler options needed for large files... " >&6; }

+ if test "${ac_cv_sys_largefile_CC+set}" = set; then

+   $as_echo_n "(cached) " >&6

+ else

+   ac_cv_sys_largefile_CC=no

+      if test "$GCC" != yes; then

+        ac_save_CC=$CC

+        while :; do

+ 	 # IRIX 6.2 and later do not support large files by default,

+ 	 # so use the C compiler's -n32 option if that helps.

+ 	 cat >conftest.$ac_ext <<_ACEOF

+ /* confdefs.h.  */

+ _ACEOF

+ cat confdefs.h >>conftest.$ac_ext

+ cat >>conftest.$ac_ext <<_ACEOF

+ /* end confdefs.h.  */

+ #include <sys/types.h>

+  /* Check that off_t can represent 2**63 - 1 correctly.

+     We can't simply define LARGE_OFF_T to be 9223372036854775807,

+     since some C++ compilers masquerading as C compilers

+     incorrectly reject 9223372036854775807.  */

+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))

+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721

+ 		       && LARGE_OFF_T % 2147483647 == 1)

+ 		      ? 1 : -1];

+ int

+ main ()

+ {

+ 

+   ;

+   return 0;

+ }

+ _ACEOF

+ 	 rm -f conftest.$ac_objext

+ if { (ac_try="$ac_compile"

+ case "(($ac_try" in

+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+   *) ac_try_echo=$ac_try;;

+ esac

+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+ $as_echo "$ac_try_echo") >&5

+   (eval "$ac_compile") 2>conftest.er1

+   ac_status=$?

+   grep -v '^ *+' conftest.er1 >conftest.err

+   rm -f conftest.er1

+   cat conftest.err >&5

+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+   (exit $ac_status); } && {

+ 	 test -z "$ac_c_werror_flag" ||

+ 	 test ! -s conftest.err

+        } && test -s conftest.$ac_objext; then

+   break

+ else

+   $as_echo "$as_me: failed program was:" >&5

+ sed 's/^/| /' conftest.$ac_ext >&5

+ 

+ 

+ fi

+ 

+ rm -f core conftest.err conftest.$ac_objext

+ 	 CC="$CC -n32"

+ 	 rm -f conftest.$ac_objext

+ if { (ac_try="$ac_compile"

+ case "(($ac_try" in

+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+   *) ac_try_echo=$ac_try;;

+ esac

+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+ $as_echo "$ac_try_echo") >&5

+   (eval "$ac_compile") 2>conftest.er1

+   ac_status=$?

+   grep -v '^ *+' conftest.er1 >conftest.err

+   rm -f conftest.er1

+   cat conftest.err >&5

+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+   (exit $ac_status); } && {

+ 	 test -z "$ac_c_werror_flag" ||

+ 	 test ! -s conftest.err

+        } && test -s conftest.$ac_objext; then

+   ac_cv_sys_largefile_CC=' -n32'; break

+ else

+   $as_echo "$as_me: failed program was:" >&5

+ sed 's/^/| /' conftest.$ac_ext >&5

+ 

+ 

+ fi

+ 

+ rm -f core conftest.err conftest.$ac_objext

+ 	 break

+        done

+        CC=$ac_save_CC

+        rm -f conftest.$ac_ext

+     fi

+ fi

+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5

+ $as_echo "$ac_cv_sys_largefile_CC" >&6; }

+   if test "$ac_cv_sys_largefile_CC" != no; then

+     CC=$CC$ac_cv_sys_largefile_CC

+   fi

+ 

+   { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5

+ $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }

+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then

+   $as_echo_n "(cached) " >&6

+ else

+   while :; do

+   cat >conftest.$ac_ext <<_ACEOF

+ /* confdefs.h.  */

+ _ACEOF

+ cat confdefs.h >>conftest.$ac_ext

+ cat >>conftest.$ac_ext <<_ACEOF

+ /* end confdefs.h.  */

+ #include <sys/types.h>

+  /* Check that off_t can represent 2**63 - 1 correctly.

+     We can't simply define LARGE_OFF_T to be 9223372036854775807,

+     since some C++ compilers masquerading as C compilers

+     incorrectly reject 9223372036854775807.  */

+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))

+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721

+ 		       && LARGE_OFF_T % 2147483647 == 1)

+ 		      ? 1 : -1];

+ int

+ main ()

+ {

+ 

+   ;

+   return 0;

+ }

+ _ACEOF

+ rm -f conftest.$ac_objext

+ if { (ac_try="$ac_compile"

+ case "(($ac_try" in

+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+   *) ac_try_echo=$ac_try;;

+ esac

+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+ $as_echo "$ac_try_echo") >&5

+   (eval "$ac_compile") 2>conftest.er1

+   ac_status=$?

+   grep -v '^ *+' conftest.er1 >conftest.err

+   rm -f conftest.er1

+   cat conftest.err >&5

+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+   (exit $ac_status); } && {

+ 	 test -z "$ac_c_werror_flag" ||

+ 	 test ! -s conftest.err

+        } && test -s conftest.$ac_objext; then

+   ac_cv_sys_file_offset_bits=no; break

+ else

+   $as_echo "$as_me: failed program was:" >&5

+ sed 's/^/| /' conftest.$ac_ext >&5

+ 

+ 

+ fi

+ 

+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

+   cat >conftest.$ac_ext <<_ACEOF

+ /* confdefs.h.  */

+ _ACEOF

+ cat confdefs.h >>conftest.$ac_ext

+ cat >>conftest.$ac_ext <<_ACEOF

+ /* end confdefs.h.  */

+ #define _FILE_OFFSET_BITS 64

+ #include <sys/types.h>

+  /* Check that off_t can represent 2**63 - 1 correctly.

+     We can't simply define LARGE_OFF_T to be 9223372036854775807,

+     since some C++ compilers masquerading as C compilers

+     incorrectly reject 9223372036854775807.  */

+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))

+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721

+ 		       && LARGE_OFF_T % 2147483647 == 1)

+ 		      ? 1 : -1];

+ int

+ main ()

+ {

+ 

+   ;

+   return 0;

+ }

+ _ACEOF

+ rm -f conftest.$ac_objext

+ if { (ac_try="$ac_compile"

+ case "(($ac_try" in

+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+   *) ac_try_echo=$ac_try;;

+ esac

+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+ $as_echo "$ac_try_echo") >&5

+   (eval "$ac_compile") 2>conftest.er1

+   ac_status=$?

+   grep -v '^ *+' conftest.er1 >conftest.err

+   rm -f conftest.er1

+   cat conftest.err >&5

+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+   (exit $ac_status); } && {

+ 	 test -z "$ac_c_werror_flag" ||

+ 	 test ! -s conftest.err

+        } && test -s conftest.$ac_objext; then

+   ac_cv_sys_file_offset_bits=64; break

+ else

+   $as_echo "$as_me: failed program was:" >&5

+ sed 's/^/| /' conftest.$ac_ext >&5

+ 

+ 

+ fi

+ 

+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

+   ac_cv_sys_file_offset_bits=unknown

+   break

+ done

+ fi

+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5

+ $as_echo "$ac_cv_sys_file_offset_bits" >&6; }

+ case $ac_cv_sys_file_offset_bits in #(

+   no | unknown) ;;

+   *)

+ cat >>confdefs.h <<_ACEOF

+ #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits

+ _ACEOF

+ ;;

+ esac

+ rm -rf conftest*

+   if test $ac_cv_sys_file_offset_bits = unknown; then

+     { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5

+ $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }

+ if test "${ac_cv_sys_large_files+set}" = set; then

+   $as_echo_n "(cached) " >&6

+ else

+   while :; do

+   cat >conftest.$ac_ext <<_ACEOF

+ /* confdefs.h.  */

+ _ACEOF

+ cat confdefs.h >>conftest.$ac_ext

+ cat >>conftest.$ac_ext <<_ACEOF

+ /* end confdefs.h.  */

+ #include <sys/types.h>

+  /* Check that off_t can represent 2**63 - 1 correctly.

+     We can't simply define LARGE_OFF_T to be 9223372036854775807,

+     since some C++ compilers masquerading as C compilers

+     incorrectly reject 9223372036854775807.  */

+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))

+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721

+ 		       && LARGE_OFF_T % 2147483647 == 1)

+ 		      ? 1 : -1];

+ int

+ main ()

+ {

+ 

+   ;

+   return 0;

+ }

+ _ACEOF

+ rm -f conftest.$ac_objext

+ if { (ac_try="$ac_compile"

+ case "(($ac_try" in

+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+   *) ac_try_echo=$ac_try;;

+ esac

+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+ $as_echo "$ac_try_echo") >&5

+   (eval "$ac_compile") 2>conftest.er1

+   ac_status=$?

+   grep -v '^ *+' conftest.er1 >conftest.err

+   rm -f conftest.er1

+   cat conftest.err >&5

+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+   (exit $ac_status); } && {

+ 	 test -z "$ac_c_werror_flag" ||

+ 	 test ! -s conftest.err

+        } && test -s conftest.$ac_objext; then

+   ac_cv_sys_large_files=no; break

+ else

+   $as_echo "$as_me: failed program was:" >&5

+ sed 's/^/| /' conftest.$ac_ext >&5

+ 

+ 

+ fi

+ 

+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

+   cat >conftest.$ac_ext <<_ACEOF

+ /* confdefs.h.  */

+ _ACEOF

+ cat confdefs.h >>conftest.$ac_ext

+ cat >>conftest.$ac_ext <<_ACEOF

+ /* end confdefs.h.  */

+ #define _LARGE_FILES 1

+ #include <sys/types.h>

+  /* Check that off_t can represent 2**63 - 1 correctly.

+     We can't simply define LARGE_OFF_T to be 9223372036854775807,

+     since some C++ compilers masquerading as C compilers

+     incorrectly reject 9223372036854775807.  */

+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))

+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721

+ 		       && LARGE_OFF_T % 2147483647 == 1)

+ 		      ? 1 : -1];

+ int

+ main ()

+ {

+ 

+   ;

+   return 0;

+ }

+ _ACEOF

+ rm -f conftest.$ac_objext

+ if { (ac_try="$ac_compile"

+ case "(($ac_try" in

+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+   *) ac_try_echo=$ac_try;;

+ esac

+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+ $as_echo "$ac_try_echo") >&5

+   (eval "$ac_compile") 2>conftest.er1

+   ac_status=$?

+   grep -v '^ *+' conftest.er1 >conftest.err

+   rm -f conftest.er1

+   cat conftest.err >&5

+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+   (exit $ac_status); } && {

+ 	 test -z "$ac_c_werror_flag" ||

+ 	 test ! -s conftest.err

+        } && test -s conftest.$ac_objext; then

+   ac_cv_sys_large_files=1; break

+ else

+   $as_echo "$as_me: failed program was:" >&5

+ sed 's/^/| /' conftest.$ac_ext >&5

+ 

+ 

+ fi

+ 

+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

+   ac_cv_sys_large_files=unknown

+   break

+ done

+ fi

+ { $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5

+ $as_echo "$ac_cv_sys_large_files" >&6; }

+ case $ac_cv_sys_large_files in #(

+   no | unknown) ;;

+   *)

+ cat >>confdefs.h <<_ACEOF

+ #define _LARGE_FILES $ac_cv_sys_large_files

+ _ACEOF

+ ;;

+ esac

+ rm -rf conftest*

+   fi

+ fi

+ 

+ 

  { $as_echo "$as_me:$LINENO: checking for st_blksize" >&5

  $as_echo_n "checking for st_blksize... " >&6; }

  cat >conftest.$ac_ext <<_ACEOF

*** ../vim-7.2.412/src/version.c	2010-05-07 15:51:59.000000000 +0200

--- src/version.c	2010-05-07 16:04:29.000000000 +0200

***************

*** 683,684 ****

--- 683,686 ----

  {   /* Add new patch number below this line */

+ /**/

+     413,

  /**/

-- 

How To Keep A Healthy Level Of Insanity:

2. Page yourself over the intercom. Don't disguise your voice.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\        download, build and distribute -- http://www.A-A-P.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///