From 7259b258d18dfd3de5ae43b4fb16bb314650ec1d Mon Sep 17 00:00:00 2001 From: senhuang42 Date: Wed, 7 Oct 2020 13:47:38 -0400 Subject: [PATCH] Add callsites to zstdcli.c and tests to playTests.sh --- programs/zstdcli.c | 6 +++++- tests/playTests.sh | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/zstdcli.c b/programs/zstdcli.c index b1893ca4..9b6f9153 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -697,6 +697,7 @@ int main(int const argCount, const char* argv[]) int argNb, followLinks = 0, forceStdout = 0, + hasStdout = 0, ldmFlag = 0, main_pause = 0, nbWorkers = 0, @@ -1282,9 +1283,12 @@ int main(int const argCount, const char* argv[]) } /* No status message in pipe mode (stdin - stdout) */ - if (!strcmp(filenames->fileNames[0], stdinmark) && outFileName && !strcmp(outFileName,stdoutmark) && (g_displayLevel==2)) g_displayLevel=1; + hasStdout = outFileName && !strcmp(outFileName,stdoutmark); + + if (hasStdout && (g_displayLevel==2)) g_displayLevel=1; /* IO Stream/File */ + FIO_setHasStdoutOutput(fCtx, hasStdout); FIO_setNbFilesTotal(fCtx, (int)filenames->tableSize); FIO_determineHasStdinInput(fCtx, filenames); FIO_setNotificationLevel(g_displayLevel); diff --git a/tests/playTests.sh b/tests/playTests.sh index 7f75d850..fd602e7a 100755 --- a/tests/playTests.sh +++ b/tests/playTests.sh @@ -396,9 +396,8 @@ cp tmp_rm3.zst tmp_rm4.zst echo 'Y' | zstd -d tmp_rm3.zst tmp_rm4.zst -o tmp_rm_out --rm test ! -f tmp_rm3.zst test ! -f tmp_rm4.zst -echo 'yes' | zstd tmp_rm_out tmp_rm3 -c --rm > $INTOVOID -test ! -f tmp_rm_out -test ! -f tmp_rm3 +echo 'yes' | zstd tmp_rm_out tmp_rm3 -c --rm && die "compressing multiple files to stdout with --rm should fail unless -f is specified" +echo 'yes' | zstd tmp_rm_out tmp_rm3 -c --rm -v && die "compressing multiple files to stdout with --rm should fail unless -f is specified" println gooder > tmpexists1 zstd tmpexists1 tmpexists -c --rm -f > $INTOVOID