| 1 |
commit: 705e0bb15c17788b30042f1267179727a834d485 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 26 18:51:14 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 26 18:51:14 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=705e0bb1 |
| 7 |
|
| 8 |
Improved readability of doc/revdep-pax.1 and scripts/revdep-pax |
| 9 |
|
| 10 |
--- |
| 11 |
doc/revdep-pax.1 | 10 +++++----- |
| 12 |
doc/revdep-pax.pod | 2 +- |
| 13 |
scripts/revdep-pax | 36 ++++++++++++++++++------------------ |
| 14 |
3 files changed, 24 insertions(+), 24 deletions(-) |
| 15 |
|
| 16 |
diff --git a/doc/revdep-pax.1 b/doc/revdep-pax.1 |
| 17 |
index 3933f76..b991d90 100644 |
| 18 |
--- a/doc/revdep-pax.1 |
| 19 |
+++ b/doc/revdep-pax.1 |
| 20 |
@@ -181,15 +181,15 @@ so that the PaX flags of the target inherit the flags of the source. |
| 21 |
.IP "\fB\-l\fR \s-1LIBRARY\s0 Retrieve only the reverse mappings for this \s-1LIBRARY\s0." 4 |
| 22 |
.IX Item "-l LIBRARY Retrieve only the reverse mappings for this LIBRARY." |
| 23 |
.IP "" 4 |
| 24 |
-.IP "\fB\-m\fR Prompt the user to mark the found object with the PaX flags of the source" 4 |
| 25 |
-.IX Item "-m Prompt the user to mark the found object with the PaX flags of the source" |
| 26 |
+.IP "\fB\-m\fR Prompt the user to mark the found object with the PaX flags of the source." 4 |
| 27 |
+.IX Item "-m Prompt the user to mark the found object with the PaX flags of the source." |
| 28 |
.IP "" 4 |
| 29 |
.IP "\fB\-v\fR Report all mappings, not just the mismatched ones." 4 |
| 30 |
.IX Item "-v Report all mappings, not just the mismatched ones." |
| 31 |
.IP "" 4 |
| 32 |
-.ie n .IP "\fB\-e\fR If \-v is chosen, then limit the report to only those executables in the current shell's $PATH. If \-m is chosen, then limit the markings to only those executables. This flag only has effect for reverse mappings, i.e., for \-r, \-s or \-l." 4 |
| 33 |
-.el .IP "\fB\-e\fR If \-v is chosen, then limit the report to only those executables in the current shell's \f(CW$PATH\fR. If \-m is chosen, then limit the markings to only those executables. This flag only has effect for reverse mappings, i.e., for \-r, \-s or \-l." 4 |
| 34 |
-.IX Item "-e If -v is chosen, then limit the report to only those executables in the current shell's $PATH. If -m is chosen, then limit the markings to only those executables. This flag only has effect for reverse mappings, i.e., for -r, -s or -l." |
| 35 |
+.ie n .IP "\fB\-e\fR If \-m is chosen, then limit the markings to only those executables in the current shell's $PATH. If \-v is chosen, then similarly limit the report. This flag only has effect for reverse mappings, i.e., for \-r, \-s or \-l." 4 |
| 36 |
+.el .IP "\fB\-e\fR If \-m is chosen, then limit the markings to only those executables in the current shell's \f(CW$PATH\fR. If \-v is chosen, then similarly limit the report. This flag only has effect for reverse mappings, i.e., for \-r, \-s or \-l." 4 |
| 37 |
+.IX Item "-e If -m is chosen, then limit the markings to only those executables in the current shell's $PATH. If -v is chosen, then similarly limit the report. This flag only has effect for reverse mappings, i.e., for -r, -s or -l." |
| 38 |
.IP "" 4 |
| 39 |
.IP "\fB\-h\fR Print out a short help message and exit." 4 |
| 40 |
.IX Item "-h Print out a short help message and exit." |
| 41 |
|
| 42 |
diff --git a/doc/revdep-pax.pod b/doc/revdep-pax.pod |
| 43 |
index a72b0ba..98175bd 100644 |
| 44 |
--- a/doc/revdep-pax.pod |
| 45 |
+++ b/doc/revdep-pax.pod |
| 46 |
@@ -68,7 +68,7 @@ so that the PaX flags of the target inherit the flags of the source. |
| 47 |
|
| 48 |
=item |
| 49 |
|
| 50 |
-=item B<-e> If -v is chosen, then limit the report to only those executables in the current shell's $PATH. If -m is chosen, then limit the markings to only those executables. This flag only has effect for reverse mappings, i.e., for -r, -s or -l. |
| 51 |
+=item B<-e> If -m is chosen, then limit the markings to only those executables in the current shell's $PATH. If -v is chosen, then similarly limit the report. This flag only has effect for reverse mappings, i.e., for -r, -s or -l. |
| 52 |
|
| 53 |
=item |
| 54 |
|
| 55 |
|
| 56 |
diff --git a/scripts/revdep-pax b/scripts/revdep-pax |
| 57 |
index b65a65a..827d700 100755 |
| 58 |
--- a/scripts/revdep-pax |
| 59 |
+++ b/scripts/revdep-pax |
| 60 |
@@ -192,24 +192,6 @@ def print_reverse_linkings( reverse_linkings, so2library_mappings, verbose, exec |
| 61 |
print |
| 62 |
|
| 63 |
|
| 64 |
-def run_usage(): |
| 65 |
- print 'Package Name : elfix' |
| 66 |
- print 'Bug Reports : http://bugs.gentoo.org/' |
| 67 |
- print 'Program Name : revdep-pax' |
| 68 |
- print 'Description : Get or set pax flags on an ELF object' |
| 69 |
- print |
| 70 |
- print 'Usage : revdep-pax -f [-v] print out all forward mappings for all system binaries' |
| 71 |
- print ' : revdep-pax -r [-ve] print out all reverse mappings for all system sonames' |
| 72 |
- print ' : revdep-pax -b OBJECT [-mv] print all forward mappings only for OBJECT' |
| 73 |
- print ' : revdep-pax -s SONAME [-mve] print all reverse mappings only for SONAME' |
| 74 |
- print ' : revdep-pax -l LIBRARY [-mve] print all reverse mappings only for LIBRARY file' |
| 75 |
- print ' : revdep-pax [-h] print out this help' |
| 76 |
- print ' : -v verbose, otherwise just print mismatching objects' |
| 77 |
- print ' : -e assuming verbose, only print out executables in shell $PATH' |
| 78 |
- print ' : -m don\'t just report, but mark the mismatching objects' |
| 79 |
- print |
| 80 |
- |
| 81 |
- |
| 82 |
def run_forward(verbose): |
| 83 |
( forward_linkings, so2library_mappings ) = get_forward_linkings() |
| 84 |
print_forward_linkings( forward_linkings, so2library_mappings, verbose) |
| 85 |
@@ -348,6 +330,24 @@ def run_soname(name, verbose, use_soname, executable_only, mark): |
| 86 |
print |
| 87 |
|
| 88 |
|
| 89 |
+def run_usage(): |
| 90 |
+ print 'Package Name : elfix' |
| 91 |
+ print 'Bug Reports : http://bugs.gentoo.org/' |
| 92 |
+ print 'Program Name : revdep-pax' |
| 93 |
+ print 'Description : Get or set pax flags on an ELF object' |
| 94 |
+ print |
| 95 |
+ print 'Usage : revdep-pax -f [-v] print out all forward mappings for all system binaries' |
| 96 |
+ print ' : revdep-pax -r [-ve] print out all reverse mappings for all system sonames' |
| 97 |
+ print ' : revdep-pax -b OBJECT [-mv] print all forward mappings only for OBJECT' |
| 98 |
+ print ' : revdep-pax -s SONAME [-mve] print all reverse mappings only for SONAME' |
| 99 |
+ print ' : revdep-pax -l LIBRARY [-mve] print all reverse mappings only for LIBRARY file' |
| 100 |
+ print ' : revdep-pax [-h] print out this help' |
| 101 |
+ print ' : -v verbose, otherwise just print mismatching objects' |
| 102 |
+ print ' : -e assuming verbose, only print out executables in shell $PATH' |
| 103 |
+ print ' : -m don\'t just report, but mark the mismatching objects' |
| 104 |
+ print |
| 105 |
+ |
| 106 |
+ |
| 107 |
def main(): |
| 108 |
try: |
| 109 |
opts, args = getopt.getopt(sys.argv[1:], 'hfrb:s:l:vem') |
Archives