lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-08-05 19:15:58 +03:00
Code Activity

Merge pull request #2876 from 15596858998/dev

Browse Source 
Solve the bug of extra output newline character
This commit is contained in:
Yann Collet
2021-12-01 15:10:08 -08:00
committed by GitHub
parent 8031dc7a48 e315a047c7
commit 3133d1e86e
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
programs/fileio.c
View File

@@ -889,26 +889,25 @@ static int FIO_removeMultiFilesWarning(FIO_ctx_t* const fCtx, const FIO_prefs_t*
if (fCtx->nbFilesTotal > 1 && !prefs->overwrite) { if (fCtx->nbFilesTotal > 1 && !prefs->overwrite) {
if (g_display_prefs.displayLevel <= displayLevelCutoff) { if (g_display_prefs.displayLevel <= displayLevelCutoff) {
if (prefs->removeSrcFile) { if (prefs->removeSrcFile) {
DISPLAYLEVEL(1, "zstd: Aborting... not deleting files and processing into dst: %s", outFileName); DISPLAYLEVEL(1, "zstd: Aborting... not deleting files and processing into dst: %s\n", outFileName);
error = 1; error = 1;
} }
} else { } else {
if (!strcmp(outFileName, stdoutmark)) { if (!strcmp(outFileName, stdoutmark)) {
DISPLAYLEVEL(2, "zstd: WARNING: all input files will be processed and concatenated into stdout. "); DISPLAYLEVEL(2, "zstd: WARNING: all input files will be processed and concatenated into stdout. \n");
} else { } else {
DISPLAYLEVEL(2, "zstd: WARNING: all input files will be processed and concatenated into a single output file: %s ", outFileName); DISPLAYLEVEL(2, "zstd: WARNING: all input files will be processed and concatenated into a single output file: %s \n", outFileName);
} }
DISPLAYLEVEL(2, "\nThe concatenated output CANNOT regenerate the original directory tree. ") DISPLAYLEVEL(2, "The concatenated output CANNOT regenerate the original directory tree. \n")
if (prefs->removeSrcFile) { if (prefs->removeSrcFile) {
if (fCtx->hasStdoutOutput) { if (fCtx->hasStdoutOutput) {
DISPLAYLEVEL(1, "\nAborting. Use -f if you really want to delete the files and output to stdout"); DISPLAYLEVEL(1, "Aborting. Use -f if you really want to delete the files and output to stdout\n");
error = 1; error = 1;
} else { } else {
error = g_display_prefs.displayLevel > displayLevelCutoff && UTIL_requireUserConfirmation("This is a destructive operation. Proceed? (y/n): ", "Aborting...", "yY", fCtx->hasStdinInput); error = g_display_prefs.displayLevel > displayLevelCutoff && UTIL_requireUserConfirmation("This is a destructive operation. Proceed? (y/n): ", "Aborting...", "yY", fCtx->hasStdinInput);
} }
} }
} }
DISPLAY("\n");
} }
return error; return error;
} }

4
tests/playTests.sh
View File

@@ -713,6 +713,10 @@ test -f tmp2
test -f tmp3 test -f tmp3
test -f tmp4 test -f tmp4
println "test : survive the list of files with too long filenames (--filelist=FILE)"
datagen -g51M > tmp_badList
zstd -f --filelist=tmp_badList && die "should have failed : file name length is too long"
println "test : survive a list of files which is text garbage (--filelist=FILE)" println "test : survive a list of files which is text garbage (--filelist=FILE)"
datagen > tmp_badList datagen > tmp_badList
zstd -f --filelist=tmp_badList && die "should have failed : list is text garbage" zstd -f --filelist=tmp_badList && die "should have failed : list is text garbage"