Merge lp:~ben-hutchings/ensoft-sextant/objdump-parser-nogrep-opt into lp:ensoft-sextant

[Ben Hutchings]

Added an option to run_objdump to disable grepping the objdump output.

Added an option to run_objdump to disable grepping the objdump output.

[Robert (rjwills)]

review: Approve

[Martin Morrison (isoschiz)]

No proposals found for merge of lp:~ben-hutchings/ensoft-sextant/objdump-filepath-fix into lp:ensoft-sextant.

=== modified file 'src/sextant/objdump_parser.py'
--- src/sextant/objdump_parser.py	2014-12-18 10:45:17 +0000
+++ src/sextant/objdump_parser.py	2014-12-18 10:45:17 +0000
@@ -350,7 +350,7 @@
         return result
 
 
-def run_objdump(input_file, add_file_paths=False):
+def run_objdump(input_file, add_file_paths=False, do_grep=True):
     """
     Run the objdump command on the file with the given path.
 
@@ -363,6 +363,10 @@
         add_file_paths:
             Whether to call with -l option to extract line numbers and source
             files from the binary. VERY SLOW on large binaries (~15 hours for ios).
+        do_grep:
+            Whether to filter the output of objdump through grep to remove
+            everything except section headers, function definitions, function 
+            calls and filepaths.
         
     """
     print('input file: {}'.format(input_file))
@@ -373,12 +377,16 @@
         args += ['--line-numbers']
 
     p = subprocess.Popen(args, stdout=subprocess.PIPE)
-    # Egrep filters out the section headers (Disassembly of section...),
-    # the call lines (... [l]call[q] ...), the function declarations
-    # (... <function>:$) and the file paths (^/file_path).
-    g = subprocess.Popen(['egrep', 'Disassembly|call(q)? |>:$|^/'], 
-                         stdin=p.stdout, stdout=subprocess.PIPE)
-    return input_file, g.stdout
+
+    if do_grep:
+        # Egrep filters out the section headers (Disassembly of section...),
+        # the call lines (... [l]call[q] ...), the function declarations
+        # (... <function>:$) and the file paths (^/file_path).
+        g = subprocess.Popen(['egrep', 'Disassembly|call(q)? |>:$|^/'], 
+                             stdin=p.stdout, stdout=subprocess.PIPE)
+        return input_file, g.stdout
+    else:
+        return input_file, p.stdout
 
 
 def main():