=== modified file 'bin/fileset.awk' --- bin/fileset.awk 2013-09-26 20:09:40 +0000 +++ bin/fileset.awk 2013-09-26 19:34:34 +0000 @@ -198,22 +198,17 @@ } # cat, copy, content; eats rest of statement and puts it into the file - if(cchar ~ /[cC]/) { + if(cchar == "c") { cmd_mknod("test -f "fname, "file") - if(cchar == "C") { - content = statement - statement = "" - } else { - content = get_till_tab() - } # unless disabled with the N flag, append newline at the end of # last line, if not already present - printf_fmt = crest ~ /n/ || (crest !~ /N/ && content !~ /\n$/) ? \ + printf_fmt = crest ~ /n/ || (crest !~ /N/ && statement !~ /\n$/) ? \ "%s\\n" : "%s" printf_redir = (crest ~ /a/ ? ">>" : ">") fname - # print_i("content="quoted(content)) + # print_i("content="quoted(statement)) # print_d("printf "printf_redir" '"printf_fmt"' \"$content\"") - print_d("printf "printf_redir" '"printf_fmt"' "quoted(content)) + print_d("printf "printf_redir" '"printf_fmt"' "quoted(statement)) + statement = "" continue } === modified file 'bin/fslist' --- bin/fslist 2013-09-26 20:09:40 +0000 +++ bin/fslist 2013-09-26 19:34:34 +0000 @@ -7,12 +7,12 @@ typeset -A ftypes hardlinks ftypes=( # convert hex type to mnemonic character - c s # socket + c S # socket a l # symbolic link 8 f # regular file - 6 b # block device + 6 B # block device 4 d # directory - 2 u # character device + 2 C # character device 1 p # FIFO ) @@ -76,11 +76,7 @@ else flags+=N fi - if [[ $content == *$'\t'* || $content == *$'\n'* ]]; then - statement C$flags$'\t'$content $'\n' - else - statement c$flags$'\t'$content $'\n' - fi + statement c$flags$'\t'$content $'\n' fi statement o$s[uid]:$s[gid] statement m$fmode