[arch-dev-public] [PATCH 2/2] Use the is_elf function in other modules where it makes sense

[Dan McGee]

The rpath module is another one that exhibits rather poor behavior, as it
also tried to call readelf on things that didn't make sense at all. Squash
this and get some big gains on packages with a lot of files.

As a point of reference, running all modules on 4 varying packages has gone
from 29.7 seconds to 5.0 seconds.

Signed-off-by: Dan McGee <dan at archlinux.org>
---
 Namcap/elffiles.py |    4 ++--
 Namcap/rpath.py    |   15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Namcap/elffiles.py b/Namcap/elffiles.py
index ac6a29d..7e69668 100644
--- a/Namcap/elffiles.py
+++ b/Namcap/elffiles.py
@@ -19,7 +19,7 @@
 
 import os
 import re
-
+from Namcap.util import is_elf
 
 process = lambda s: re.search("/tmp/namcap\.[0-9]*/(.*)", s).group(1)
 
@@ -35,7 +35,7 @@ def scanelf(invalid_elffiles,dirname,names):
 		valid_dir_found = False
 		
 		# Checking for ELF files
-		if os.path.isfile(file_path) and file(file_path).read(4)=='\x7fELF':			
+		if is_elf(file_path):
 			for f in valid_dirs:
 				if ('/' + process(file_path)).startswith(f):
 					valid_dir_found = True
diff --git a/Namcap/rpath.py b/Namcap/rpath.py
index 530771c..faf6d3e 100644
--- a/Namcap/rpath.py
+++ b/Namcap/rpath.py
@@ -18,6 +18,7 @@
 #
 
 import pacman, os, subprocess, re
+from Namcap.util import is_elf
 
 process = lambda s: re.search("/tmp/namcap\.[0-9]*/(.*)", s).group(1)
 
@@ -26,15 +27,17 @@ def checkrpath(insecure_rpaths, dirname, names):
 
 	allowed = ['/usr/lib']
 	warn = ['/usr/local/lib']
+	libpath = re.compile('Library rpath: \[(.*)\]')
 
 	for i in names:
-		if os.path.isfile(dirname+'/'+i):
-			var = subprocess.Popen('readelf -d ' + dirname+'/'+i,
+		mypath = dirname + '/' + i
+		if is_elf(mypath):
+			var = subprocess.Popen('readelf -d ' + mypath,
 					shell=True,
 					stdout=subprocess.PIPE,
 					stderr=subprocess.PIPE).communicate()
 			for j in var[0].split('\n'):
-				n = re.search('Library rpath: \[(.*)\]', j)
+				n = libpath.search(j)
 				# Is this a Library rpath: line?
 				if n != None:
 					if ":" in n.group(1):
@@ -43,10 +46,10 @@ def checkrpath(insecure_rpaths, dirname, names):
 						rpaths=[n.group(1)]
 					for path in rpaths:
 						if path not in allowed:
-							insecure_rpaths[0].append(process(dirname+'/'+i))
+							insecure_rpaths[0].append(process(mypath))
 							break
-						if path in warn and process(dirname + "/" + i) not in insecure_rpaths:
-							insecure_rpaths[1].append(process(dirname+'/'+i))
+						if path in warn and process(mypath) not in insecure_rpaths:
+							insecure_rpaths[1].append(process(mypath))
 
 class package:
 	def short_name(self):
-- 
1.6.4.4