Skip to content

Delete rpaths one at a time #362

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

Merged
merged 2 commits into from
May 22, 2021
Merged

Delete rpaths one at a time #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a6ee5
Delete rpaths one at a time
carlocab May 20, 2021
29628d8
Tweak `#delete_rpath` test
carlocab May 21, 2021
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
7 changes: 3 additions & 4 deletions lib/macho/macho_file.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,11 +415,10 @@ def add_rpath(path, _options = {})
# @note `_options` is currently unused and is provided for signature
# compatibility with {MachO::FatFile#delete_rpath}
def delete_rpath(path, _options = {})
rpath_cmds = command(:LC_RPATH).select { |r| r.path.to_s == path }
raise RpathUnknownError, path if rpath_cmds.empty?
rpath_cmd = command(:LC_RPATH).find { |r| r.path.to_s == path }
raise RpathUnknownError, path unless rpath_cmd

# delete the commands in reverse order, offset descending.
rpath_cmds.reverse_each { |cmd| delete_command(cmd) }
delete_command(rpath_cmd)
end

# Write all Mach-O data to the given filename.
Expand Down
17 changes: 11 additions & 6 deletions test/test_macho.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,14 +451,19 @@ def test_delete_rpath
file = MachO::MachOFile.new(filename)

refute_empty file.rpaths
orig_ncmds = file.ncmds
orig_ncmds = current_ncmds = file.ncmds
orig_sizeofcmds = file.sizeofcmds
orig_npaths = file.rpaths.size
orig_npaths = current_npaths = file.rpaths.size

file.delete_rpath(file.rpaths.first)
assert_operator file.ncmds, :<, orig_ncmds
assert_operator file.sizeofcmds, :<, orig_sizeofcmds
assert_operator file.rpaths.size, :<, orig_npaths
file.rpaths.each do |rpath|
file.delete_rpath(rpath)
current_npaths -= 1
current_ncmds -= 1

assert_equal file.ncmds, current_ncmds
assert_equal file.rpaths.size, current_npaths
assert_operator file.sizeofcmds, :<, orig_sizeofcmds
end

file.write(actual)
# ensure we can actually re-load and parse the modified file
Expand Down