find: In -execdir ... {} +, only pass one file per invocation.
This is inefficient but ensures that -execdir ... {} + does not mix files from different directories in one invocation; the command could not access some files. Files from the same directory should really be handled in one invocation but this is somewhat more complicated.
This commit is contained in:
parent
08851ea288
commit
bc62617630
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=246618
@ -711,7 +711,13 @@ c_exec(OPTION *option, char ***argvp)
|
||||
for (ep = environ; *ep != NULL; ep++)
|
||||
argmax -= strlen(*ep) + 1 + sizeof(*ep);
|
||||
argmax -= 1 + sizeof(*ep);
|
||||
new->e_pnummax = argmax / 16;
|
||||
/*
|
||||
* Ensure that -execdir ... {} + does not mix files
|
||||
* from different directories in one invocation.
|
||||
* Files from the same directory should be handled
|
||||
* in one invocation but there is no code for it.
|
||||
*/
|
||||
new->e_pnummax = new->flags & F_EXECDIR ? 1 : argmax / 16;
|
||||
argmax -= sizeof(char *) * new->e_pnummax;
|
||||
if (argmax <= 0)
|
||||
errx(1, "no space for arguments");
|
||||
|
Loading…
Reference in New Issue
Block a user