Makefile: use xargs -0 consistently
#6706
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
whitslack
commented
Sep 21, 2023
| @@ -385,7 +385,7 @@ $(GRPC_GEN)&: cln-grpc/proto/node.proto cln-grpc/proto/primitives.proto | |||
| $(PYTHON) -m grpc_tools.protoc -I cln-grpc/proto cln-grpc/proto/node.proto --python_out=$(GRPC_PATH)/ --grpc_python_out=$(GRPC_PATH)/ --experimental_allow_proto3_optional | |||
| $(PYTHON) -m grpc_tools.protoc -I cln-grpc/proto cln-grpc/proto/primitives.proto --python_out=$(GRPC_PATH)/ --experimental_allow_proto3_optional | |||
| find $(GRPC_DIR)/ -type f -name "*.py" -print0 | xargs -0 sed -i'.bak' -e 's/^import \(.*\)_pb2 as .*__pb2/from pyln.grpc import \1_pb2 as \1__pb2/g' | |||
| find $(GRPC_DIR)/ -type f -name "*.py.bak" -print0 | xargs rm -f | |||
| find $(GRPC_DIR)/ -type f -name "*.py.bak" -print0 | xargs -0 rm -f | |||
There was a problem hiding this comment.
This is the actual fix. The other changes are defensive.
|
Just kidding about 91d48c7. GNU |
|
Nice change. You kind of blamed the wrong commit (it just added -f to rm, before that was the same issue), but doesn't matter. |
In its default mode, `xargs` interprets any whitespace as a delimiter, and it interprets single and double quotes and backslashes specially. This can play havoc when fed by tools that don't escape these special characters in their output. Fortunately, `xargs` (at least the GNU version of it) has a `-0` option that changes the behavior so that only NUL characters act as delimiters, and no other characters have any special meaning. Use this option consistently to avoid any nasty surprises. Note that `git-ls-files` has a `-z` option that causes it to terminate filenames on output with a NUL character instead of a newline, and `grep` has a `-z` option that causes it to operate on NUL-terminated records rather than on lines. Use these options together with `xargs -0`. Note: This commit corrects an oversight introduced in 9d94687. Changelog-None
rustyrussell
force-pushed
the
xargs-0
branch
from
7cead08 to
1c2c7e2
Compare
|
Rebased on latest master to avoid CI brokenness. |
@rustyrussell: How is that? 9d94687 changed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In its default mode,
xargsinterprets any whitespace as a delimiter, and it interprets single and double quotes and backslashes specially. This can play havoc when fed by tools that don't escape these special characters in their output.Fortunately,
xargs(at least the GNU and macOS versions of it) has a-0option that changes the behavior so that only NUL characters act as delimiters, and no other characters have any special meaning. Use this option consistently to avoid any nasty surprises.Note that
git-ls-fileshas a-zoption that causes it to terminate filenames on output with a NUL character instead of a newline, andgrephas a-zoption that causes it to operate on NUL-terminated records rather than on lines. Use these options together withxargs -0.Note: This commit corrects an oversight introduced in 9d94687.