summaryrefslogtreecommitdiffstats
path: root/programs/lz4io.c
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2015-05-25 06:50:41 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2015-05-25 06:50:41 (GMT)
commitacae59a73969f436f95ed31130efe0ee9f7b3e48 (patch)
treed60ed8b68fe40160d14d2c9151f86e025c5f4302 /programs/lz4io.c
parent91c1b9a682a8b4d6e9b5eb47194890c14480116d (diff)
downloadlz4-acae59a73969f436f95ed31130efe0ee9f7b3e48.zip
lz4-acae59a73969f436f95ed31130efe0ee9f7b3e48.tar.gz
lz4-acae59a73969f436f95ed31130efe0ee9f7b3e48.tar.bz2
Fixed : default sparse mode disabled on stdout, to support ` >>` redirection scenario reported by Takayuki Matsuoka (#110)
Diffstat (limited to 'programs/lz4io.c')
-rw-r--r--programs/lz4io.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/programs/lz4io.c b/programs/lz4io.c
index dc0b9ec..e782664 100644
--- a/programs/lz4io.c
+++ b/programs/lz4io.c
@@ -278,6 +278,11 @@ static int LZ4IO_getFiles(const char* input_filename, const char* output_filenam
DISPLAYLEVEL(4,"Using stdout for output\n");
*pfoutput = stdout;
SET_BINARY_MODE(stdout);
+ if (g_sparseFileSupport==1)
+ {
+ g_sparseFileSupport = 0;
+ DISPLAYLEVEL(4, "Sparse File Support is automatically disabled on stdout ; try --sparse \n");
+ }
}
else
{
@@ -303,13 +308,6 @@ static int LZ4IO_getFiles(const char* input_filename, const char* output_filenam
if (*pfoutput==0) EXM_THROW(13, "Pb opening %s", output_filename);
- if (g_sparseFileSupport)
- {
- long int ftr = ftell(*pfoutput);
- /* DISPLAY("%s->%s ==> %i \n", input_filename, output_filename, (int)ftr); */
- if (ftr!=0) g_sparseFileSupport = 0;
- }
-
return 0;
}
@@ -674,7 +672,7 @@ static unsigned LZ4IO_fwriteSparse(FILE* file, const void* buffer, size_t buffer
{
size_t sizeCheck;
seekResult = fseek(file, storedSkips, SEEK_CUR);
- if (seekResult) EXM_THROW(72, "Skip error (sparse file)");
+ if (seekResult) EXM_THROW(72, "Sparse skip error ; try --no-sparse");
storedSkips = 0;
seg0SizeT -= nb0T;
ptrT += nb0T;
@@ -696,7 +694,7 @@ static unsigned LZ4IO_fwriteSparse(FILE* file, const void* buffer, size_t buffer
{
size_t sizeCheck;
int seekResult = fseek(file, storedSkips, SEEK_CUR);
- if (seekResult) EXM_THROW(74, "Skip error (end of block)");
+ if (seekResult) EXM_THROW(74, "Sparse skip error ; try --no-sparse");
storedSkips = 0;
sizeCheck = fwrite(restPtr, 1, restEnd - restPtr, file);
if (sizeCheck != (size_t)(restEnd - restPtr)) EXM_THROW(75, "Write error : cannot write decoded end of block");