=== modified file 'bin/fileset.awk' --- bin/fileset.awk 2015-11-27 18:19:20 +0000 +++ bin/fileset.awk 2014-06-26 14:20:39 +0000 @@ -169,16 +169,6 @@ continue } - # binary, base64; decodes the arguments and changes file content - if(cchar ~ /[bB]/) { - shellfunc("f 1", crest) - content = get_argument(cchar == "B") - - base64_redir = (crest ~ /a/ ? ">>" : ">") fname - print_d("base64 "base64_redir" <<<"quoted(content)) - continue - } - # run shell command if(cchar == "!") { # use as Filter === modified file 'bin/fslist' --- bin/fslist 2015-11-27 18:19:20 +0000 +++ bin/fslist 2014-07-09 19:39:16 +0000 @@ -39,11 +39,6 @@ : ${print_m:=1} : ${print_o:=1} : ${print_c:=1} -if (($+commands[file])) && (($+commands[base64])); then - : ${print_b:=1} -else - : ${print_b:=0} -fi fnames=( ) for arg in "${@:-$ROOT}"; do @@ -90,25 +85,21 @@ statement $'l\t'$s[link] $'\t' elif [[ $t == f ]]; then if (($print_c)); then - if (($print_b)) && [[ $(file -bi $fname) != text/* ]]; then - statement B$'\t'"$(base64 <$fname)" $'\n' - else - IFS= read -r -d '' content <$fname - flags='' + IFS= read -r -d '' content <$fname + flags='' + if [[ $content == *$'\n' ]]; then + content=${content%$'\n'} if [[ $content == *$'\n' ]]; then - content=${content%$'\n'} - if [[ $content == *$'\n' ]]; then - # force appending newline - flags+=n - fi - else - flags+=N - fi - if ! (($compact)) || [[ $content == *$'\t'* || $content == *$'\n'* ]]; then - statement C$flags$'\t'$content $'\n' - else - statement c$flags$'\t'$content - fi + # force appending newline + flags+=n + fi + else + flags+=N + fi + if ! (($compact)) || [[ $content == *$'\t'* || $content == *$'\n'* ]]; then + statement C$flags$'\t'$content $'\n' + else + statement c$flags$'\t'$content fi else statement f