Minor Fixes

dev
W. Felix Handte 2019-10-25 13:58:58 -04:00
parent 24499036ba
commit 4eccc82875
3 changed files with 4 additions and 4 deletions

View File

@ -2400,7 +2400,6 @@ FIO_determineDstName(const char* srcFileName, const char* outDirName)
/* The short tar extensions tzst, tgz, txz and tlz4 files should have "tar" /* The short tar extensions tzst, tgz, txz and tlz4 files should have "tar"
* extension on decompression. Also writes terminating null. */ * extension on decompression. Also writes terminating null. */
strcpy(dstFileNameBuffer + dstFileNameEndPos, dstSuffix); strcpy(dstFileNameBuffer + dstFileNameEndPos, dstSuffix);
dstFileNameEndPos += dstSuffixLen;
return dstFileNameBuffer; return dstFileNameBuffer;
/* note : dstFileNameBuffer memory is not going to be free */ /* note : dstFileNameBuffer memory is not going to be free */

View File

@ -31,7 +31,8 @@ extern "C" {
# define nulmark "/dev/null" # define nulmark "/dev/null"
#endif #endif
/* We test whether the extension we found starts with 't', and if so, we append /**
* We test whether the extension we found starts with 't', and if so, we append
* ".tar" to the end of the output name. * ".tar" to the end of the output name.
*/ */
#define LZMA_EXTENSION ".lzma" #define LZMA_EXTENSION ".lzma"

View File

@ -865,14 +865,14 @@ if [ $GZIPMODE -eq 1 ]; then
fi fi
if [ $LZMAMODE -eq 1 ]; then if [ $LZMAMODE -eq 1 ]; then
tar c tmp | xz > tmp.txz tar c tmp | $ZSTD --format=xz > tmp.txz
$ZSTD -d tmp.txz $ZSTD -d tmp.txz
[ -e tmp.tar ] || die ".txz failed to decompress to .tar!" [ -e tmp.tar ] || die ".txz failed to decompress to .tar!"
rm -f tmp.tar tmp.txz rm -f tmp.tar tmp.txz
fi fi
if [ $LZ4MODE -eq 1 ]; then if [ $LZ4MODE -eq 1 ]; then
tar c tmp | lz4 > tmp.tlz4 tar c tmp | $ZSTD --format=lz4 > tmp.tlz4
$ZSTD -d tmp.tlz4 $ZSTD -d tmp.tlz4
[ -e tmp.tar ] || die ".tlz4 failed to decompress to .tar!" [ -e tmp.tar ] || die ".tlz4 failed to decompress to .tar!"
rm -f tmp.tar tmp.tlz4 rm -f tmp.tar tmp.tlz4