Turn off sparse mode for OS X by default

diff --git a/programs/fileio.c b/programs/fileio.c
index 572e9c9ac47db20695a9f5a98c820933c058d403..87871ae0151f1a7df4be7d0f1167ea0c927ba075 100644 (file)
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -227,6 +227,9 @@ static FILE* FIO_openDstFile(const char* dstFileName)
             DISPLAYLEVEL(4, "Sparse File Support is automatically disabled on stdout ; try --sparse \n");
         }
     } else {
+        if (ZSTD_SPARSE_DEFAULT == 0 && g_sparseFileSupport == 1) {
+            g_sparseFileSupport = 0;
+        }
         if (!g_overwrite && strcmp (dstFileName, nulmark)) {  /* Check if destination file already exists */
             f = fopen( dstFileName, "rb" );
             if (f != 0) {  /* dest file exists, prompt for overwrite authorization */

diff --git a/programs/platform.h b/programs/platform.h
index ee781951234f4e609ad8b814eb0111abd8895bc7..74412cde332ea37539c1f7b14cd3aed604b91d2e 100644 (file)
--- a/programs/platform.h
+++ b/programs/platform.h
@@ -138,6 +138,14 @@ static __inline int IS_CONSOLE(FILE* stdStream)
 #endif
 
 
+#ifndef ZSTD_SPARSE_DEFAULT
+#  if (defined(__APPLE__) && defined(__MACH__))
+#    define ZSTD_SPARSE_DEFAULT 0
+#  else
+#    define ZSTD_SPARSE_DEFAULT 1
+#  endif
+#endif
+
 
 #if defined (__cplusplus)
 }

diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index e2709ec84fc59e914cfad8db9a78c12b16d68fbc..0cf8cacd19f091e611076f3dc55ac6a22ce6ba8c 100644 (file)
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -137,7 +137,11 @@ static int usage_advanced(const char* programName)
 #endif
 #ifndef ZSTD_NODECOMPRESS
     DISPLAY( "--test  : test compressed file integrity \n");
+#if ZSTD_SPARSE_DEFAULT
     DISPLAY( "--[no-]sparse : sparse mode (default:enabled on file, disabled on stdout)\n");
+#else
+    DISPLAY( "--[no-]sparse : sparse mode (default:disabled)\n");
+#endif
 #endif
     DISPLAY( " -M#    : Set a memory usage limit for decompression \n");
     DISPLAY( "--      : All arguments after \"--\" are treated as files \n");