[GRASS-SVN] r39791 - grass/branches/releasebranch_6_4/lib/segment

[svn_grass at osgeo.org]

Author: mmetz
Date: 2009-11-23 05:33:03 -0500 (Mon, 23 Nov 2009)
New Revision: 39791

Modified:
   grass/branches/releasebranch_6_4/lib/segment/Makefile
   grass/branches/releasebranch_6_4/lib/segment/format.c
Log:
use LFS if available (backported from trunk r39760, r39789)

Modified: grass/branches/releasebranch_6_4/lib/segment/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/lib/segment/Makefile	2009-11-23 10:21:48 UTC (rev 39790)
+++ grass/branches/releasebranch_6_4/lib/segment/Makefile	2009-11-23 10:33:03 UTC (rev 39791)
@@ -22,6 +22,11 @@
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
+#compile if LFS Large File Support present:
+ifneq ($(USE_LARGEFILES),)
+	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
+endif
+
 default: lib
 
 #doxygen:

Modified: grass/branches/releasebranch_6_4/lib/segment/format.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/segment/format.c	2009-11-23 10:21:48 UTC (rev 39790)
+++ grass/branches/releasebranch_6_4/lib/segment/format.c	2009-11-23 10:33:03 UTC (rev 39791)
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <limits.h>
 #include <grass/segment.h>
 
 
@@ -118,6 +119,19 @@
 	return -3;
     }
 
+    /* no LFS, file size within 2GB limit ? */
+    if (sizeof(off_t) == 4) {
+	double file_size;
+
+	file_size = (double) nrows * ncols * len;
+
+	if (file_size > INT_MAX) {
+	    G_warning("segment file size would be %.2fGB, but file size limit is 2GB", file_size / (1 << 30));
+	    G_warning("please recompile with LFS");
+	    G_fatal_error("can not create temporary segment file");
+	}
+    }
+
     if (lseek(fd, 0L, SEEK_SET) == (off_t) - 1) {
 	G_warning("Segment_format: %s", strerror(errno));
 	return -1;