Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix for -r on empty directory #3027

Merged
merged 6 commits into from
Jan 29, 2022
Merged

fix for -r on empty directory #3027

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4021b78
fix for error message in recursive mode for an empty folder
brailovich Jan 25, 2022
62583dc
Merge pull request #1 from brailovich/brailovich-patch-1
brailovich Jan 25, 2022
beb4872
Update zstdcli.c
brailovich Jan 27, 2022
5e75233
Update playTests.sh
brailovich Jan 27, 2022
501a353
Update playTests.sh
brailovich Jan 27, 2022
9f37d1f
Update playTests.sh
brailovich Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion programs/zstdcli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,7 @@ int main(int argCount, const char* argv[])
size_t streamSrcSize = 0;
size_t targetCBlockSize = 0;
size_t srcSizeHint = 0;
size_t nbInputFileNames = 0;
int dictCLevel = g_defaultDictCLevel;
unsigned dictSelect = g_defaultSelectivityLevel;
#ifndef ZSTD_NODICT
Expand Down Expand Up @@ -1256,6 +1257,8 @@ int main(int argCount, const char* argv[])
}
}

nbInputFileNames = filenames->tableSize; /* saving number of input files */

if (recursive) { /* at this stage, filenameTable is a list of paths, which can contain both files and directories */
UTIL_expandFNT(&filenames, followLinks);
}
Expand Down Expand Up @@ -1358,7 +1361,17 @@ int main(int argCount, const char* argv[])
#endif

/* No input filename ==> use stdin and stdout */
if (filenames->tableSize == 0) UTIL_refFilename(filenames, stdinmark);
if (filenames->tableSize == 0) {
/* It is possible that the input
was a number of empty directories. In this case
stdin and stdout should not be used */
if (nbInputFileNames > 0 ){
DISPLAYLEVEL(2, "please provide correct input file(s) or non-empty directories -- ignored \n");
brailovich marked this conversation as resolved.
Show resolved Hide resolved
CLEAN_RETURN(2);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also be CLEAN_RETURN(1);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, if we want the CLI to return without erroring in this scenario, it should be CLEAN_RETURN(0).

brailovich marked this conversation as resolved.
Show resolved Hide resolved
}
UTIL_refFilename(filenames, stdinmark);
}

if (!strcmp(filenames->fileNames[0], stdinmark) && !outFileName)
outFileName = stdoutmark; /* when input is stdin, default output is stdout */

Expand Down