Just strip everything by default, fully tested version :-) #15339
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,33 +4,78 @@ fixupOutputHooks+=(_doStrip) | |
|
|
||
| _doStrip() { | ||
| if [ -z "$dontStrip" ]; then | ||
|
|
||
| stripDirs "${stripDebugList:-*}" "${stripDebugFlags:--S}" | ||
|
|
||
| if [ -n "${stripAllList:-}" ]; then | ||
| stripDirs "${stripAllList:-}" "${stripAllFlags:--s}" | ||
| fi | ||
| fi | ||
| } | ||
|
|
||
| stripDirs() { | ||
| local stripFlags="$2" | ||
|
|
||
| # Ensure $prefix is a directory | ||
| if [ -f "$prefix" ]; then | ||
| header "Stripping (with flags $stripFlags) the file ${prefix}." | ||
| echo -ne $prefix'\0' | stripAll "$stripFlags" | ||
| stopNest | ||
| fi | ||
| [ -d "$prefix" ] || return 0 | ||
|
|
||
| # Ensure expansion occurs within $prefix/. | ||
| pushd "$prefix" >/dev/null | ||
| shopt -s dotglob | ||
| local stripDirs=( $1 ) | ||
| local ignoreDirs=( $dontStripList ) | ||
| shopt -u dotglob | ||
| popd >/dev/null | ||
| local debugIncluded= debugExcluded= p= | ||
|
|
||
| # `find` fails on missing paths. Remove them. | ||
| local roots=() | ||
| for p in "${stripDirs[@]}"; do | ||
| if [ -e "$prefix/$p" ]; then | ||
| roots+=( "$prefix/$p" ) | ||
| debugIncluded="$debugIncluded${debugIncluded:+,}$p" | ||
| fi | ||
| done | ||
| [ "${#roots[@]}" -eq 0 ] && return 0 | ||
|
||
|
|
||
| # Add ignored paths to find command. | ||
| local findArgs=( "${roots[@]}" ) | ||
| for p in "${ignoreDirs[@]}"; do | ||
| if [ -e "$prefix/$p" ]; then | ||
| findArgs+=( "-path" "$prefix/$p" "-prune" "-o" ) | ||
| debugExcluded="$debugExcluded $p" | ||
| fi | ||
| done | ||
|
|
||
| header "Stripping (with flags $stripFlags) in $prefix${debugIncluded:+"/{$debugIncluded}"}${debugExcluded:+", skipping$debugExcluded"}." | ||
| find "${findArgs[@]}" -type f -print0 | stripAll "$stripFlags" | ||
| stopNest | ||
| } | ||
|
|
||
| stripAll() { | ||
| local stripFlags="$1" | ||
|
|
||
| local _ls f stripOutput | ||
| while IFS= read -r -d $'\0' f; do | ||
| # Skip very small files, they make strip choke. | ||
| _ls=( $(ls -Ln "$f") ) | ||
| [ "${_ls[4]}" -lt 4 ] && continue; | ||
|
|
||
| if stripOutput=$(strip $commonStripFlags $stripFlags "$f" 2>&1); then | ||
| echo "Stripped $f" | ||
| else | ||
| # Ignore failures on files that cannot be stripped. | ||
| [ "$stripOutput" = "strip:$f: File format not recognized" ] && continue | ||
| [ "$stripOutput" = "strip:$f: File truncated" ] && continue | ||
|
|
||
| [ -n "$stripOutput" ] && echo "$stripOutput" | ||
| echo "Strip failed on file $f" | ||
| false # fail ! | ||
| fi | ||
| done | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick: in
_doStripI would change all:-to-, so that people can explicitly define those variables as empty without being overridden back to the default values. (Yes, one could define them as" ", but it seems nicer to allow empty string as well.)Note that otherwise e.g. the first
ifwill always fire, as*is used whenever the expansion could be empty.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does an empty string mean ? Strip everything or nothing ?
For now, passing an empty string to stripDirs strips nothing because it is interpreted as a gob pattern. This is why "" is replaced by "*".
If you want to disable stripping, why not use dontStrip ?
My fear is that if the variable is defined for some reason, or remains (say, from another output), the result may not be expected by the user.
I may however remove the useless
if. Would that suit you ?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed the if in bda09f6.