Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-projects commit in pax-utils: lddtree.sh |
| Date: | Tue, 01 Dec 2009 10:16:32 |
| Message-Id: | E1NFPmY-00080X-DT@stork.gentoo.org |
| 1 | vapier 09/12/01 10:16:30 |
| 2 | |
| 3 | Modified: lddtree.sh |
| 4 | Log: |
| 5 | allow lddtree to be sourced by other scripts to share common funcs |
| 6 | |
| 7 | Revision Changes Path |
| 8 | 1.5 pax-utils/lddtree.sh |
| 9 | |
| 10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/lddtree.sh?rev=1.5&view=markup |
| 11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/lddtree.sh?rev=1.5&content-type=text/plain |
| 12 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/lddtree.sh?r1=1.4&r2=1.5 |
| 13 | |
| 14 | Index: lddtree.sh |
| 15 | =================================================================== |
| 16 | RCS file: /var/cvsroot/gentoo-projects/pax-utils/lddtree.sh,v |
| 17 | retrieving revision 1.4 |
| 18 | retrieving revision 1.5 |
| 19 | diff -u -r1.4 -r1.5 |
| 20 | --- lddtree.sh 17 Jan 2008 04:37:19 -0000 1.4 |
| 21 | +++ lddtree.sh 1 Dec 2009 10:16:30 -0000 1.5 |
| 22 | @@ -16,27 +16,6 @@ |
| 23 | exit ${1:-0} |
| 24 | } |
| 25 | |
| 26 | -SHOW_ALL=false |
| 27 | -SET_X=false |
| 28 | - |
| 29 | -([[ $1 == "" ]] || [[ $1 == --help ]]) && usage 1 |
| 30 | -opts="hax" |
| 31 | -getopt -Q -- "${opts}" "$@" || exit 1 |
| 32 | -eval set -- $(getopt -- "${opts}" "$@") |
| 33 | -while [[ -n $1 ]] ; do |
| 34 | - case $1 in |
| 35 | - -a) SHOW_ALL=true;; |
| 36 | - -x) SET_X=true;; |
| 37 | - -h) usage;; |
| 38 | - --) shift; break;; |
| 39 | - -*) usage 1;; |
| 40 | - esac |
| 41 | - shift |
| 42 | -done |
| 43 | - |
| 44 | -${SET_X} && set -x |
| 45 | - |
| 46 | -ret=0 |
| 47 | error() { |
| 48 | echo "${argv0}: $*" 1>&2 |
| 49 | ret=1 |
| 50 | @@ -105,6 +84,30 @@ |
| 51 | done |
| 52 | } |
| 53 | |
| 54 | +# XXX: internal hack |
| 55 | +if [[ $1 != "/../..source.lddtree" ]] ; then |
| 56 | + |
| 57 | +SHOW_ALL=false |
| 58 | +SET_X=false |
| 59 | + |
| 60 | +([[ $1 == "" ]] || [[ $1 == --help ]]) && usage 1 |
| 61 | +opts="hax" |
| 62 | +getopt -Q -- "${opts}" "$@" || exit 1 |
| 63 | +eval set -- $(getopt -- "${opts}" "$@") |
| 64 | +while [[ -n $1 ]] ; do |
| 65 | + case $1 in |
| 66 | + -a) SHOW_ALL=true;; |
| 67 | + -x) SET_X=true;; |
| 68 | + -h) usage;; |
| 69 | + --) shift; break;; |
| 70 | + -*) usage 1;; |
| 71 | + esac |
| 72 | + shift |
| 73 | +done |
| 74 | + |
| 75 | +${SET_X} && set -x |
| 76 | + |
| 77 | +ret=0 |
| 78 | for elf in "$@" ; do |
| 79 | if [[ ! -e ${elf} ]] ; then |
| 80 | error "${elf}: file does not exist" |
| 81 | @@ -118,5 +121,6 @@ |
| 82 | show_elf "${elf}" 0 "" |
| 83 | fi |
| 84 | done |
| 85 | - |
| 86 | exit ${ret} |
| 87 | + |
| 88 | +fi |