From: Jim Meyering <meyering@redhat.com>
Date: Fri, 9 Apr 2010 08:49:38 +0000 (+0200)
Subject: maint: ftruncate is always available, even without gnulib
X-Git-Tag: v8.5~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef5758c3282b3325340d8b601deed5ab5e7ade64;p=thirdparty%2Fcoreutils.git

maint: ftruncate is always available, even without gnulib

Now that even MinGW provides ftruncate, we know that all
reasonable portability targets provide this function.
Remove the workaround code.  We nearly removed the gnulib
module three years ago:
  http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/9203
and it is now officially "obsolete".
* bootstrap.conf (gnulib_modules): Remove ftruncate.
* src/copy.c (copy_reg): Remove use of HAVE_FTRUNCATE and its
no-longer-used workaround code.
* src/truncate.c: Remove a comment about handling missing ftruncate.
---

diff --git a/bootstrap.conf b/bootstrap.conf
index 9cdf984ba0..ad7d6d5860 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -97,7 +97,6 @@ gnulib_modules="
   fsusage
   fsync
   ftello
-  ftruncate
   fts
   getdate
   getgroups
diff --git a/src/copy.c b/src/copy.c
index 29f37c9804..3c32fa3118 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -798,15 +798,9 @@ copy_reg (char const *src_name, char const *dst_name,
 
       if (last_write_made_hole)
         {
-          if (HAVE_FTRUNCATE
-              ? /* ftruncate sets the file size,
-                   so there is no need for a write.  */
-              ftruncate (dest_desc, n_read_total) < 0
-              : /* Seek backwards one character and write a null.  */
-              (lseek (dest_desc, (off_t) -1, SEEK_CUR) < 0L
-               || full_write (dest_desc, "", 1) != 1))
+          if (ftruncate (dest_desc, n_read_total) < 0)
             {
-              error (0, errno, _("writing %s"), quote (dst_name));
+              error (0, errno, _("truncating %s"), quote (dst_name));
               return_val = false;
               goto close_src_and_dst_desc;
             }
diff --git a/src/truncate.c b/src/truncate.c
index 70573cc2fd..ece52ee76b 100644
--- a/src/truncate.c
+++ b/src/truncate.c
@@ -18,12 +18,7 @@
 
    This is backwards compatible with the FreeBSD utility, but is more
    flexible wrt the size specifications and the use of long options,
-   to better fit the "GNU" environment.
-
-   Note if !defined(HAVE_FTRUNCATE) then the --skip-ftruncate configure flag
-   was specified or we're in a mingw environment. In these cases gnulib
-   emulation will be used and GNULIB_FTRUNCATE is defined. Note if emulation
-   can't even be provided ftruncate() will return EIO.  */
+   to better fit the "GNU" environment.  */
 
 #include <config.h>             /* sets _FILE_OFFSET_BITS=64 etc. */
 #include <stdio.h>