ftruncate: Support for MSVC 9.

* lib/ftruncate.c: Include errno.h, msvc-inval.h.
(chsize_nothrow): New function.
(chsize): Redefine as a macro.
* m4/ftruncate.m4 (gl_PREREQ_FTRUNCATE): Require AC_C_INLINE.
* modules/ftruncate (Depends-on): Add msvc-inval.

diff --git a/ChangeLog b/ChangeLog
index c7bc060..12ef00a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-09-25  Bruno Haible  <bruno@clisp.org>
 
+       ftruncate: Support for MSVC 9.
+       * lib/ftruncate.c: Include errno.h, msvc-inval.h.
+       (chsize_nothrow): New function.
+       (chsize): Redefine as a macro.
+       * m4/ftruncate.m4 (gl_PREREQ_FTRUNCATE): Require AC_C_INLINE.
+       * modules/ftruncate (Depends-on): Add msvc-inval.
+
+2011-09-25  Bruno Haible  <bruno@clisp.org>
+
        New module 'fstat'.
        * lib/sys_stat.in.h (fstat): Declare only if GNULIB_FSTAT is set.
        * lib/fstat.c: New file, based on a piece of lib/fchdir.c.

diff --git a/lib/ftruncate.c b/lib/ftruncate.c
index d5a3be1..ae1e858 100644 (file)
--- a/lib/ftruncate.c
+++ b/lib/ftruncate.c
@@ -8,8 +8,32 @@
 
 #if HAVE_CHSIZE
 
+# include <errno.h>
 # include <io.h>
 
+# if HAVE_MSVC_INVALID_PARAMETER_HANDLER
+#  include "msvc-inval.h"
+static inline int
+chsize_nothrow (int fd, long length)
+{
+  int result;
+
+  TRY_MSVC_INVAL
+    {
+      result = chsize (fd, length);
+    }
+  CATCH_MSVC_INVAL
+    {
+      result = -1;
+      errno = EBADF;
+    }
+  DONE_MSVC_INVAL;
+
+  return result;
+}
+#  define chsize chsize_nothrow
+# endif
+
 int
 ftruncate (int fd, off_t length)
 {

diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4
index 4273090..4a47ba4 100644 (file)
--- a/m4/ftruncate.m4
+++ b/m4/ftruncate.m4
@@ -1,4 +1,4 @@
-# serial 17
+# serial 18
 
 # See if we need to emulate a missing ftruncate function using chsize.
 
@@ -19,5 +19,6 @@ AC_DEFUN([gl_FUNC_FTRUNCATE],
 # Prerequisites of lib/ftruncate.c.
 AC_DEFUN([gl_PREREQ_FTRUNCATE],
 [
+  AC_REQUIRE([AC_C_INLINE])
   AC_CHECK_FUNCS([chsize])
 ])

diff --git a/modules/ftruncate b/modules/ftruncate
index 3bea20b..097ed9c 100644 (file)
--- a/modules/ftruncate
+++ b/modules/ftruncate
@@ -8,6 +8,7 @@ m4/ftruncate.m4
 Depends-on:
 unistd
 largefile
+msvc-inval      [test $HAVE_FTRUNCATE = 0]
 
 configure.ac:
 gl_FUNC_FTRUNCATE