admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Escape any spaces in path during strip step

Browse Source 
Not using path.basename for mktemp due to risk of bugs due to incorrect escaping. But mainly, mktemp gives a unique name and this operation is procedural.
This commit is contained in:
Max Howell 2010-01-13 05:37:58 +00:00
parent d8c3b3a80a
commit 1ead7d380a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/brew.h.rb
View File

@ -442,11 +442,13 @@ private
puts "strip #{path}" if ARGV.verbose? puts "strip #{path}" if ARGV.verbose?
path.chmod 0644 # so we can strip path.chmod 0644 # so we can strip
unless path.stat.nlink > 1 unless path.stat.nlink > 1
`strip #{args} #{path}` system "strip", *(args+path)
else else
path = path.to_s.gsub ' ', '\\ '
# strip unlinks the file and recreates it, thus breaking hard links! # strip unlinks the file and recreates it, thus breaking hard links!
# is this expected behaviour? patch does it too… still, this fixes it # is this expected behaviour? patch does it too… still, this fixes it
tmp = `/usr/bin/mktemp -t #{path.basename}`.chomp tmp = `/usr/bin/mktemp -t homebrew_strip`.chomp
`/usr/bin/strip #{args} -o #{tmp} #{path}` `/usr/bin/strip #{args} -o #{tmp} #{path}`
`/bin/cat #{tmp} > #{path}` `/bin/cat #{tmp} > #{path}`
File.unlink tmp File.unlink tmp