diff options
| author | Tony Finch <fanf@FreeBSD.org> | 2010-01-19 18:18:15 +0000 |
|---|---|---|
| committer | Tony Finch <fanf@FreeBSD.org> | 2010-01-19 18:18:15 +0000 |
| commit | f20a8dd3ac4db7ac6f7ebd2aac5b5d374350922d (patch) | |
| tree | 19eb1d3a65bc3f56ccfb4d9f3a803e046479d23a /usr.bin/unifdef | |
| parent | 4992d459a5a80f27eae88fa3d3c28b620686796d (diff) | |
| download | src-test2-f20a8dd3ac4db7ac6f7ebd2aac5b5d374350922d.tar.gz src-test2-f20a8dd3ac4db7ac6f7ebd2aac5b5d374350922d.zip | |
Sync unifdefall with upstream. It no longer relies entirely on $PATH
to find unifdef, in order to support running the test suite before
installing.
Notes
Notes:
svn path=/head/; revision=202636
Diffstat (limited to 'usr.bin/unifdef')
| -rw-r--r-- | usr.bin/unifdef/unifdefall.sh | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/usr.bin/unifdef/unifdefall.sh b/usr.bin/unifdef/unifdefall.sh index b443054d8abd..179fc9390dda 100644 --- a/usr.bin/unifdef/unifdefall.sh +++ b/usr.bin/unifdef/unifdefall.sh @@ -2,7 +2,8 @@ # # unifdefall: remove all the #if's from a source file # -# Copyright (c) 2002 - 2009 Tony Finch <dot@dotat.at>. All rights reserved. +# Copyright (c) 2002 - 2010 Tony Finch <dot@dotat.at> +# Copyright (c) 2009 - 2010 Jonathan Nieder <jrnieder@gmail.com> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -25,19 +26,27 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $dotat: unifdef/unifdefall.sh,v 1.24 2009/11/26 12:54:39 fanf2 Exp $ +# $dotat: unifdef/unifdefall.sh,v 1.27 2010/01/19 16:09:50 fanf2 Exp $ # $FreeBSD$ set -e -basename=$(basename $0) +unifdef="$(dirname "$0")/unifdef" +if [ ! -e "$unifdef" ] +then + unifdef=unifdef +fi +# export to the final shell command +export unifdef + +basename=$(basename "$0") tmp=$(mktemp -d "${TMPDIR:-/tmp}/$basename.XXXXXXXXXX") || exit 2 trap 'rm -r "$tmp" || exit 1' EXIT export LC_ALL=C # list of all controlling macros -unifdef -s "$@" | sort | uniq >"$tmp/ctrl" +"$unifdef" -s "$@" | sort | uniq >"$tmp/ctrl" # list of all macro definitions cpp -dM "$@" | sort | sed 's/^#define //' >"$tmp/hashdefs" # list of defined macro names @@ -49,7 +58,7 @@ comm -12 "$tmp/ctrl" "$tmp/alldef" >"$tmp/def" # and converts them to unifdef command-line arguments sed 's|.*|s/^&\\(([^)]*)\\)\\{0,1\\} /-D&=/p|' <"$tmp/def" >"$tmp/script" # create the final unifdef command -{ echo unifdef -k \\ +{ echo '"$unifdef" -k \' # convert the controlling undefined macros to -U arguments sed 's/.*/-U& \\/' <"$tmp/undef" # convert the controlling defined macros to quoted -D arguments |