diff options
-rw-r--r-- | doc/revdep-pax.1 | 10 | ||||
-rw-r--r-- | doc/revdep-pax.pod | 2 | ||||
-rwxr-xr-x | scripts/revdep-pax | 36 |
3 files changed, 24 insertions, 24 deletions
diff --git a/doc/revdep-pax.1 b/doc/revdep-pax.1 index 3933f76..b991d90 100644 --- a/doc/revdep-pax.1 +++ b/doc/revdep-pax.1 @@ -181,15 +181,15 @@ so that the PaX flags of the target inherit the flags of the source. .IP "\fB\-l\fR \s-1LIBRARY\s0 Retrieve only the reverse mappings for this \s-1LIBRARY\s0." 4 .IX Item "-l LIBRARY Retrieve only the reverse mappings for this LIBRARY." .IP "" 4 -.IP "\fB\-m\fR Prompt the user to mark the found object with the PaX flags of the source" 4 -.IX Item "-m Prompt the user to mark the found object with the PaX flags of the source" +.IP "\fB\-m\fR Prompt the user to mark the found object with the PaX flags of the source." 4 +.IX Item "-m Prompt the user to mark the found object with the PaX flags of the source." .IP "" 4 .IP "\fB\-v\fR Report all mappings, not just the mismatched ones." 4 .IX Item "-v Report all mappings, not just the mismatched ones." .IP "" 4 -.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 -.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 -.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." +.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 +.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 +.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." .IP "" 4 .IP "\fB\-h\fR Print out a short help message and exit." 4 .IX Item "-h Print out a short help message and exit." diff --git a/doc/revdep-pax.pod b/doc/revdep-pax.pod index a72b0ba..98175bd 100644 --- a/doc/revdep-pax.pod +++ b/doc/revdep-pax.pod @@ -68,7 +68,7 @@ so that the PaX flags of the target inherit the flags of the source. =item -=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. +=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. =item diff --git a/scripts/revdep-pax b/scripts/revdep-pax index b65a65a..827d700 100755 --- a/scripts/revdep-pax +++ b/scripts/revdep-pax @@ -192,24 +192,6 @@ def print_reverse_linkings( reverse_linkings, so2library_mappings, verbose, exec print -def run_usage(): - print 'Package Name : elfix' - print 'Bug Reports : http://bugs.gentoo.org/' - print 'Program Name : revdep-pax' - print 'Description : Get or set pax flags on an ELF object' - print - print 'Usage : revdep-pax -f [-v] print out all forward mappings for all system binaries' - print ' : revdep-pax -r [-ve] print out all reverse mappings for all system sonames' - print ' : revdep-pax -b OBJECT [-mv] print all forward mappings only for OBJECT' - print ' : revdep-pax -s SONAME [-mve] print all reverse mappings only for SONAME' - print ' : revdep-pax -l LIBRARY [-mve] print all reverse mappings only for LIBRARY file' - print ' : revdep-pax [-h] print out this help' - print ' : -v verbose, otherwise just print mismatching objects' - print ' : -e assuming verbose, only print out executables in shell $PATH' - print ' : -m don\'t just report, but mark the mismatching objects' - print - - def run_forward(verbose): ( forward_linkings, so2library_mappings ) = get_forward_linkings() print_forward_linkings( forward_linkings, so2library_mappings, verbose) @@ -348,6 +330,24 @@ def run_soname(name, verbose, use_soname, executable_only, mark): print +def run_usage(): + print 'Package Name : elfix' + print 'Bug Reports : http://bugs.gentoo.org/' + print 'Program Name : revdep-pax' + print 'Description : Get or set pax flags on an ELF object' + print + print 'Usage : revdep-pax -f [-v] print out all forward mappings for all system binaries' + print ' : revdep-pax -r [-ve] print out all reverse mappings for all system sonames' + print ' : revdep-pax -b OBJECT [-mv] print all forward mappings only for OBJECT' + print ' : revdep-pax -s SONAME [-mve] print all reverse mappings only for SONAME' + print ' : revdep-pax -l LIBRARY [-mve] print all reverse mappings only for LIBRARY file' + print ' : revdep-pax [-h] print out this help' + print ' : -v verbose, otherwise just print mismatching objects' + print ' : -e assuming verbose, only print out executables in shell $PATH' + print ' : -m don\'t just report, but mark the mismatching objects' + print + + def main(): try: opts, args = getopt.getopt(sys.argv[1:], 'hfrb:s:l:vem') |