Merge branch 'dev' of github.com:facebook/zstd into dev

2016-09-07 14:54:54 +02:00
parent ac8bace6b1 aad9fe5470
commit 5c6d244973
8 changed files with 57 additions and 21 deletions
@@ -732,7 +732,10 @@ static int FIO_decompressDstFile(dRess_t ress,
    result = FIO_decompressSrcFile(ress, srcFileName);

    if (fclose(ress.dstFile)) EXM_THROW(38, "Write error : cannot properly close %s", dstFileName);
-    if (result != 0) if (remove(dstFileName)) result=1;   /* don't do anything if remove fails */
+    if ( (result != 0)
+       && strcmp(dstFileName, nulmark)  /* special case : don't remove() /dev/null (#316) */
+       && remove(dstFileName) )
+        result=1;   /* don't do anything special if remove fails */
    return result;
 }