30 lines
930 B
Diff
30 lines
930 B
Diff
--- tar-1.15.1/src/system.c.vfatTruncate 2004-09-06 07:31:00.000000000 -0400
|
|
+++ tar-1.15.1/src/system.c 2006-02-03 14:40:51.000000000 -0500
|
|
@@ -272,8 +272,25 @@
|
|
int
|
|
sys_truncate (int fd)
|
|
{
|
|
+ struct stat st;
|
|
off_t pos = lseek (fd, (off_t) 0, SEEK_CUR);
|
|
- return pos < 0 ? -1 : ftruncate (fd, pos);
|
|
+
|
|
+ if ( pos < 0)
|
|
+ return -1;
|
|
+
|
|
+ if ( ftruncate(fd, pos) && errno == EPERM ) {
|
|
+ /* wrapper around ftruncate:
|
|
+ * ftruncate may fail to grow the size of a file with some OS and filesystem
|
|
+ * combinations. Linux and vfat/fat is one example. If this is the case do
|
|
+ * a write to grow the file to the desired length.
|
|
+ */
|
|
+ if( (fstat( fd, &st ) == -1) ||
|
|
+ (st.st_size >= pos) ||
|
|
+ (lseek( fd, pos - 1, SEEK_SET) == (off_t)-1) ||
|
|
+ (write( fd, "\0", 1) == -1) )
|
|
+ return -1;
|
|
+ }
|
|
+ return 0;
|
|
}
|
|
|
|
/* Return nonzero if NAME is the name of a regular file, or if the file
|