shims/super/cc: handle double dash in args #19082
Open
+19
−8
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
carlocab
approved these changes
Jan 12, 2025
| def split_args(args) | ||
| double_dash_index = args.find_index("--") | ||
| if double_dash_index | ||
| [args[0...double_dash_index], args[double_dash_index..-1]] |
There was a problem hiding this comment.
I think the start/end indices can be omitted:
Suggested change
| [args[0...double_dash_index], args[double_dash_index..-1]] | |
| [args[...double_dash_index], args[double_dash_index..]] |
or, at the very least:
Suggested change
| [args[0...double_dash_index], args[double_dash_index..-1]] | |
| [args[0...double_dash_index], args[double_dash_index..]] |
carlocab
reviewed
Jan 12, 2025
Comment on lines
144
to
159
| case mode | ||
| when :ccld | ||
| cflags + args + cppflags + ldflags | ||
| cflags + args + cppflags + ldflags + @positional_args | ||
| when :cxxld | ||
| cxxflags + args + cppflags + ldflags | ||
| cxxflags + args + cppflags + ldflags + @positional_args | ||
| when :cc | ||
| cflags + args + cppflags | ||
| cflags + args + cppflags + @positional_args | ||
| when :cxx | ||
| cxxflags + args + cppflags | ||
| cxxflags + args + cppflags + @positional_args | ||
| when :ccE | ||
| args + cppflags | ||
| args + cppflags + @positional_args | ||
| when :cpp | ||
| args + cppflags | ||
| args + cppflags + @positional_args | ||
| when :ld | ||
| ldflags + args | ||
| ldflags + args + @positional_args | ||
| end |
There was a problem hiding this comment.
Would be nice to deduplicate all these ... + @positional_args.
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.
brew stylewith your changes locally?brew typecheckwith your changes locally?brew testswith your changes locally?The
ccshim currently does not handle invocations where--is passed as an argument, which (conventionally) indicates that all following arguments be treated as positional (non-optional) arguments. As a result, any refurbished args may get appended after the--where they are erroneously treated as input file paths:This kind of error was encountered in the wild in some core PRs, e.g. Homebrew/homebrew-core#203929, Homebrew/homebrew-core#203934, Homebrew/homebrew-core#203932, Homebrew/homebrew-core#203944.
This pull request ensures that any modifications to the arguments are applied before the
--(if--is present).Before:
After: