From d75577a2394b589b9975d5b80b3ccf8223f376a5 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 14 Dec 2013 15:43:15 -0600 Subject: [PATCH] bottle: avoid keeping entire `strings` output in memory --- Library/Homebrew/cmd/bottle.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 1e5ec4ba3a..efdc63a1da 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -86,12 +86,17 @@ module Homebrew extend self end # Use strings to search through the file for each string - strings = `strings -t x - "#{file}"`.split("\n").select{ |str| str.include? string } + IO.popen("strings -t x - '#{file}'") do |io| + until io.eof? + str = io.readline.chomp - strings.each do |str| - offset, match = str.split(" ", 2) - next if linked_libraries.include? match # Don't bother reporting a string if it was found by otool - puts " #{Tty.gray}-->#{Tty.reset} match '#{match}' at offset #{Tty.em}0x#{offset}#{Tty.reset}" + next unless str.include? string + + offset, match = str.split(" ", 2) + + next if linked_libraries.include? match # Don't bother reporting a string if it was found by otool + puts " #{Tty.gray}-->#{Tty.reset} match '#{match}' at offset #{Tty.em}0x#{offset}#{Tty.reset}" + end end end puts