[gentoo-commits] proj/elfix:master commit in: scripts/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/elfix:master commit in: scripts/
Date: Mon, 10 Oct 2011 17:29:23 +0000 (UTC)	[thread overview]
Message-ID: <9e60775a2f9e3b39abbc42cd7c27a42310cfdbfa.blueness@gentoo> (raw)

commit:     9e60775a2f9e3b39abbc42cd7c27a42310cfdbfa
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 17:29:17 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 17:29:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=9e60775a

scripts/revdep-pax: move option actions to functions

---
 scripts/revdep-pax |  111 +++++++++++++++++++++++++++++++++-------------------
 1 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/scripts/revdep-pax b/scripts/revdep-pax
index e91a964..26334c7 100755
--- a/scripts/revdep-pax
+++ b/scripts/revdep-pax
@@ -16,7 +16,7 @@ def get_ldd_linkings(elf):
 		return []
 	ldd_lines = ldd_output.split('\n')
 	linkings = []
-	mappings = []
+	mappings = {}
 	for m in range(0,len(ldd_lines)):
 		if not re.search('=>', ldd_lines[m]):
 			continue
@@ -29,7 +29,7 @@ def get_ldd_linkings(elf):
 			continue
 		filename = os.path.realpath(filename)
 		linkings.append(soname)
-		mappings.append([soname,filename])
+		mappings[soname] = filename
 	return ( linkings, mappings )
 
 
@@ -52,8 +52,7 @@ def get_forward_linkings():
 					elf = link[0]
 					( linkings, mappings ) = get_ldd_linkings(elf)
 					forward_linkings[elf] = linkings 
-					for m in mappings:
-						so2filename_mappings[m[0]] = m[1]
+					so2filename_mappings.update(mappings)
 			except:
 				continue
 
@@ -140,10 +139,62 @@ def print_reverse_linkings( reverse_linkings, so2filename_mappings ):
 def usage():
 	print 'TODO'
 
+def run_forward():
+	( forward_linkings, so2filename_mappings ) = get_forward_linkings()
+	print_forward_linkings( forward_linkings, so2filename_mappings )
+
+
+def run_reverse():
+	( forward_linkings, so2filename_mappings ) = get_forward_linkings()
+	reverse_linkings = invert_linkings( forward_linkings )
+	print_reverse_linkings( reverse_linkings, so2filename_mappings )
+
+
+def run_binary(binary, verbose):
+	( linkings, mappings ) = get_ldd_linkings(binary)
+
+	binary_flags = pax.getflags(binary)
+	print binary, '(', binary_flags, ')'
+
+	count = 0
+	for soname in linkings:
+		try:
+			filename = mappings[soname]
+			soname_flags = pax.getflags(filename)
+			if verbose:
+				print '\t', soname, '\t', filename, '(', soname_flags, ')'
+			else:
+				if binary_flags != soname_flags:
+					print '\t', soname, '\t',filename, '(', soname_flags, ')'
+					count = count + 1
+		except:
+			print "file for soname %s not found" % soname
+
+	if count == 0:
+		print '\nNo mismatches'
+
+
+def run_soname(soname, verbose):
+	( forward_linkings, so2filename_mappings ) = get_forward_linkings()
+	reverse_linkings = invert_linkings( forward_linkings )
+	linkings = reverse_linkings[soname]
+	library = so2filename_mappings[soname]
+
+	flags = pax.getflags(library)
+	if verbose:
+		print soname, '\t', library, '(', flags, ')'
+	for binary in linkings:
+		try:
+			flags = pax.getflags(binary)
+			if verbose:
+				print '\t', binary, '(', flags, ')'
+		except:
+			print "cannot obtain pax flags for %s" % binary
+
 
 def main():
 	try:
-		opts, args = getopt.getopt(sys.argv[1:], 'hfrb:s:')
+		opts, args = getopt.getopt(sys.argv[1:], 'hfrb:s:v')
 	except getopt.GetoptError, err:
 		print str(err) # will print something like 'option -a not recognized'
 		usage()
@@ -153,16 +204,18 @@ def main():
 		usage()
 		sys.exit(1)
 
+	do_usage   = False
 	do_forward = False
 	do_reverse = False
+
 	binary = None
 	soname = None
 
+	verbose = False
 
 	for o, a in opts:
 		if o == '-h':
-			usage()
-			sys.exit(1)
+			do_usage = True
 		elif o == '-f':
 			do_forward = True
 		elif o == '-r':
@@ -171,50 +224,28 @@ def main():
 			binary = a
 		elif o == '-s':
 			soname = a
+		elif o == '-v':
+			verbose = True
 		else:
 			print 'Option included in getopt but not handled here!'
-			usage()
+			print 'Please file a bug'
 			sys.exit(1)
 
+
+	if do_usage:
+		run_usage()
+
 	if do_forward:
-		( forward_linkings, so2filename_mappings ) = get_forward_linkings()
-		print_forward_linkings( forward_linkings, so2filename_mappings )
+		run_forward()
 
 	if do_reverse:
-		( forward_linkings, so2filename_mappings ) = get_forward_linkings()
-		reverse_linkings = invert_linkings( forward_linkings )
-		print_reverse_linkings( reverse_linkings, so2filename_mappings )
+		run_reverse()
 
 	if binary != None:
-		( forward_linkings, so2filename_mappings ) = get_forward_linkings()
-		linkings = forward_linkings[binary]
-
-		flags = pax.getflags(binary)
-		print binary, '(', flags, ')'
-		for soname in linkings:
-			try:
-				filename = so2filename_mappings[soname]
-				flags = pax.getflags(filename)
-				print '\t', soname, '\t', filename, '(', flags, ')'
-			except:
-				print "file for soname %s not found" % soname
+		run_binary(binary, verbose)
 
 	if soname !=None:
-		( forward_linkings, so2filename_mappings ) = get_forward_linkings()
-		reverse_linkings = invert_linkings( forward_linkings )
-		linkings = reverse_linkings[soname]
-		library = so2filename_mappings[soname]
-
-		flags = pax.getflags(library)
-		print soname, '\t', library, '(', flags, ')'
-		for binary in linkings:
-			try:
-				flags = pax.getflags(binary)
-				print '\t', binary, '(', flags, ')'
-			except:
-				print "cannot obtain pax flags for %s" % binary
-
+		run_soname(soname)
 
 if __name__ == '__main__':
     main()
-

next             reply	other threads:[~2011-10-10 17:29 UTC|newest]

Thread overview: 89+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-10 17:29 Anthony G. Basile [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-11-18 18:21 [gentoo-commits] proj/elfix:master commit in: scripts/ Anthony G. Basile
2019-04-22 22:14 Anthony G. Basile
2015-10-27 19:37 Anthony G. Basile
2015-01-04 15:42 Anthony G. Basile
2014-12-22 17:29 Anthony G. Basile
2014-10-17 20:02 Anthony G. Basile
2014-01-23 16:22 Anthony G. Basile
2014-01-20 22:44 Anthony G. Basile
2013-05-20 19:47 Anthony G. Basile
2013-03-14  2:39 Anthony G. Basile
2013-01-06 17:19 Anthony G. Basile
2012-12-28 19:34 Anthony G. Basile
2012-12-23  3:49 Anthony G. Basile
2012-12-23  2:36 Anthony G. Basile
2012-12-23  1:04 Anthony G. Basile
2012-12-22 22:20 Anthony G. Basile
2012-12-22 20:17 Anthony G. Basile
2012-12-22 19:42 Anthony G. Basile
2012-12-22 19:29 Anthony G. Basile
2012-12-22 19:02 Anthony G. Basile
2012-12-22 18:31 Anthony G. Basile
2012-12-22 16:36 Anthony G. Basile
2012-12-22  1:04 Anthony G. Basile
2012-12-20  4:26 Anthony G. Basile
2012-12-19  4:09 Anthony G. Basile
2012-12-19  3:51 Anthony G. Basile
2012-12-15 20:03 Anthony G. Basile
2012-12-14  2:19 Anthony G. Basile
2012-12-14  2:16 Anthony G. Basile
2012-12-14  2:04 Anthony G. Basile
2012-12-14  1:59 Anthony G. Basile
2012-12-14  1:26 Anthony G. Basile
2012-12-14  1:20 Anthony G. Basile
2012-07-27 22:01 Anthony G. Basile
2012-07-23 19:18 Anthony G. Basile
2012-07-23 15:46 Anthony G. Basile
2012-07-23 15:27 Anthony G. Basile
2012-07-23 14:58 Anthony G. Basile
2012-07-23 14:15 Anthony G. Basile
2012-07-23 13:06 Anthony G. Basile
2012-07-23 11:47 Anthony G. Basile
2012-07-22 23:11 Anthony G. Basile
2012-07-22 22:22 Anthony G. Basile
2012-07-21 16:28 Anthony G. Basile
2012-07-21 15:44 Anthony G. Basile
2012-07-21 15:41 Anthony G. Basile
2012-07-21 13:53 Anthony G. Basile
2011-12-28 23:19 Anthony G. Basile
2011-12-28 23:18 Anthony G. Basile
2011-12-28 16:37 Anthony G. Basile
2011-12-28 15:39 Anthony G. Basile
2011-12-28 15:31 Anthony G. Basile
2011-12-26 22:24 Anthony G. Basile
2011-12-26 20:25 Anthony G. Basile
2011-12-04 21:43 Anthony G. Basile
2011-11-27  0:17 Anthony G. Basile
2011-11-26 22:08 Anthony G. Basile
2011-11-26 21:15 Anthony G. Basile
2011-11-26 19:08 Anthony G. Basile
2011-11-26 19:07 Anthony G. Basile
2011-10-17 20:55 Anthony G. Basile
2011-10-17 20:15 Anthony G. Basile
2011-10-17 19:28 Anthony G. Basile
2011-10-16 18:27 Anthony G. Basile
2011-10-16 18:27 Anthony G. Basile
2011-10-16 18:04 Anthony G. Basile
2011-10-13  4:36 Anthony G. Basile
2011-10-13  2:27 Anthony G. Basile
2011-10-13  0:36 Anthony G. Basile
2011-10-11  0:50 Anthony G. Basile
2011-10-10 23:42 Anthony G. Basile
2011-10-10 23:21 Anthony G. Basile
2011-10-10 17:30 Anthony G. Basile
2011-10-08 18:35 Anthony G. Basile
2011-10-08  2:03 Anthony G. Basile
2011-10-08  0:46 Anthony G. Basile
2011-10-07 22:14 Anthony G. Basile
2011-10-07 19:58 Anthony G. Basile
2011-10-07  1:56 Anthony G. Basile
2011-10-06 23:39 Anthony G. Basile
2011-10-06 20:14 Anthony G. Basile
2011-10-06 19:46 Anthony G. Basile
2011-10-06  4:19 Anthony G. Basile
2011-10-06  4:07 Anthony G. Basile
2011-10-06  3:14 Anthony G. Basile
2011-10-06  3:13 Anthony G. Basile
2011-10-06  2:20 Anthony G. Basile
2011-09-08 23:50 Anthony G. Basile

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e91a964 dfblob:26334c7 )
 OR (
bs:"[gentoo-commits] proj/elfix:master commit in: scripts/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9e60775a2f9e3b39abbc42cd7c27a42310cfdbfa.blueness@gentoo \
    --to=blueness@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox