ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a warning whenever (de)compressing multiple files into one source, or into stdout

Browse Source
This commit is contained in:
senhuang42
2020-08-24 19:10:03 -04:00
parent 5d91206ebe
commit 1acf243540
2 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/fileio.c
+23
View File
@@ -1677,6 +1677,29 @@ int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs,
/* init */ /* init */
assert(outFileName != NULL || suffix != NULL); assert(outFileName != NULL || suffix != NULL);
if (outFileName != NULL) { /* output into a single destination (stdout typically) */ if (outFileName != NULL) { /* output into a single destination (stdout typically) */
if (nbFiles > 1) {
if (!strcmp (outFileName, stdoutmark)) {
DISPLAY("zstd: WARNING: all input files will be processed and concatenated into stdout. ");
} else {
DISPLAY("zstd: WARNING: all input files will be processed and concatenated into a single output file: %s ", outFileName);
}
if (prefs->removeSrcFile && !prefs->overwrite) {
DISPLAY("\nYou must specify -f as well in order to execute this command with --rm. Aborting...");
return 1;
}
DISPLAY("Proceed? (y/n): ");
{
int ch = getchar();
if ((ch != 'y') && (ch != 'Y')) {
DISPLAY("zstd: aborting...\n");
return 1;
}
/* flush the rest */
while ((ch!=EOF) && (ch!='\n'))
ch = getchar();
}
}
ress.dstFile = FIO_openDstFile(prefs, NULL, outFileName); ress.dstFile = FIO_openDstFile(prefs, NULL, outFileName);
if (ress.dstFile == NULL) { /* could not open outFileName */ if (ress.dstFile == NULL) { /* could not open outFileName */
error = 1; error = 1;
tests/playTests.sh
+15 -9
View File
@@ -349,19 +349,25 @@ rm tmp*
println "\n===> compress multiple files" println "\n===> compress multiple files"
println hello > tmp1 println hello > tmp1
println world > tmp2 println world > tmp2
zstd tmp1 tmp2 -o "$INTOVOID" -f echo 'y' | zstd tmp1 tmp2 -o "$INTOVOID" -f # echo 'y' confirms the warning prompt
zstd tmp1 tmp2 -c | zstd -t echo 'y' | zstd tmp1 tmp2 -c | zstd -t
zstd tmp1 tmp2 -o tmp.zst echo 'y' | zstd tmp1 tmp2 -o tmp.zst
test ! -f tmp1.zst test ! -f tmp1.zst
test ! -f tmp2.zst test ! -f tmp2.zst
zstd tmp1 tmp2 zstd tmp1 tmp2
zstd -t tmp1.zst tmp2.zst zstd -t tmp1.zst tmp2.zst
zstd -dc tmp1.zst tmp2.zst zstd -dc tmp1.zst tmp2.zst
zstd tmp1.zst tmp2.zst -o "$INTOVOID" -f echo 'y' | zstd tmp1.zst tmp2.zst -o "$INTOVOID" -f
zstd -d tmp1.zst tmp2.zst -o tmp echo 'y' | zstd -d tmp1.zst tmp2.zst -o tmp
touch tmpexists touch tmpexists
zstd tmp1 tmp2 -f -o tmpexists echo 'y' | zstd tmp1 tmp2 -f -o tmpexists
zstd tmp1 tmp2 -o tmpexists && die "should have refused to overwrite" echo 'y' | zstd tmp1 tmp2 -o tmpexists && die "should have refused to overwrite"
zstd tmp1 tmp2 -o "$INTOVOID" --rm && die "should have refused to execute with --rm"
println gooder > tmp_rm1
println boi > tmp_rm2
echo 'y' | zstd tmp_rm1 tmp_rm2 -o tmp_rm3.zst -f --rm
rm tmp_rm3.zst
# Bug: PR #972 # Bug: PR #972
if [ "$?" -eq 139 ]; then if [ "$?" -eq 139 ]; then
die "should not have segfaulted" die "should not have segfaulted"
@@ -382,7 +388,7 @@ test -f tmp1
test -f tmp2 test -f tmp2
test -f tmp3 test -f tmp3
println "compress tmp* into stdout > tmpall : " println "compress tmp* into stdout > tmpall : "
zstd -c tmp1 tmp2 tmp3 > tmpall echo 'y' | zstd -c tmp1 tmp2 tmp3 > tmpall
test -f tmpall # should check size of tmpall (should be tmp1.zst + tmp2.zst + tmp3.zst) test -f tmpall # should check size of tmpall (should be tmp1.zst + tmp2.zst + tmp3.zst)
println "decompress tmpall* into stdout > tmpdec : " println "decompress tmpall* into stdout > tmpdec : "
cp tmpall tmpall2 cp tmpall tmpall2
@@ -920,7 +926,7 @@ datagen | zstd -c | zstd -t
println "\n===> golden files tests " println "\n===> golden files tests "
zstd -t -r "$TESTDIR/golden-decompression" zstd -t -r "$TESTDIR/golden-decompression"
zstd -c -r "$TESTDIR/golden-compression" | zstd -t echo 'y' | zstd -c -r "$TESTDIR/golden-compression" | zstd -t
zstd -D "$TESTDIR/golden-dictionaries/http-dict-missing-symbols" "$TESTDIR/golden-compression/http" -c | zstd -D "$TESTDIR/golden-dictionaries/http-dict-missing-symbols" -t zstd -D "$TESTDIR/golden-dictionaries/http-dict-missing-symbols" "$TESTDIR/golden-compression/http" -c | zstd -D "$TESTDIR/golden-dictionaries/http-dict-missing-symbols" -t