fileset

commit 495a8f55773398deff638fa6ca05f6d039dd2cc4
parent 511842b72a9e6ec0a7b4e095e7e3204a8936158c
Author: Jan Pobrislo <ccx@wpr.cz>
Date:   Wed,  9 Dec 2015 23:13:01 +0100

fix syntax in fileset.awk, disable printing of rsync filters to stderr to default
Diffstat:
M
bin/fileset.awk
 | 
16
++++++++--------
M
bin/fileset_inc.sh
 | 
21
+++++++++++++++++----

2 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/bin/fileset.awk b/bin/fileset.awk
@@ -52,8 +52,8 @@ function print_e(str) {  # print end block
 function print_rsfilter(str) {
 	if ("RSFILTER" in ENVIRON) {
 		print str >>ENVIRON["RSFILTER"]
-	} else {
-		print str >>"/dev/stderr"
+	# } else {
+	# 	print str >>"/dev/stderr"
 	}
 }
 
@@ -165,7 +165,7 @@ function process_statement() {
 			printf_fmt = crest ~ /n/ || (crest !~ /N/ && content !~ /\n$/) ? \
 					   "%s\\n" : "%s"
 
-			func_name = "f_" func_name++
+			func_name = "f" func_name++
 			funcs[func_name] = "\tprintf '"printf_fmt"' "quoted(content)
 
 			if(crest ~ /a/) {
@@ -183,7 +183,7 @@ function process_statement() {
 			shellfunc("f", crest)
 			content = get_argument(cchar == "B")
 
-			func_name = "f_" func_name++
+			func_name = "f" func_name++
 			funcs[func_name] = "\tbase64 <<<"quoted(content)
 
 			if(crest ~ /a/) {
@@ -264,7 +264,7 @@ function print_functions() {
 }
 
 BEGIN {
-	print_b("check_main() {"
+	print_b("check_main() {")
 }
 
 { parse_line($0) }
@@ -272,10 +272,10 @@ BEGIN {
 END {
 	process_statement()
 	print_e("}")
-	print_b("check_main() {")
+	print_b("do_main() {")
 	print_i("true")
 	print_e("}")
-	print
+	print ""
 	print_functions()
-	print_i "req main"
+	print_i("req main")
 }
diff --git a/bin/fileset_inc.sh b/bin/fileset_inc.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 export fname
 die() {
-	printf '%s\\n' \"$*\"
+	printf '%s\n' "$*"
 	exit 1
 }
 
@@ -17,6 +17,19 @@ flags() {
 	case "$1" in (*o*) f_o=true;; (*) f_o=false;; esac
 }
 
+
+print_flags() {
+	$f_bang && printf '!'
+	$f_p && printf p
+	$f_f && printf f
+	$f_r && printf r
+	$f_n && printf n
+	$f_N && printf N
+	$f_a && printf a
+	$f_i && printf i
+	$f_o && printf o
+}
+
 # TODO: search $PATH
 if ! test -x /bin/readlink -o -x /usr/bin/readlink; then
 	# Hackity hack. If you know of better way, let me know.
@@ -36,9 +49,9 @@ fi
 req() {
 	if ! "check_$@"; then
 		if $check_only; then
-			die "check failed on $filename: $*"
+			die "check failed on '$fname': $* ($(print_flags))"
 		else
-			"do_$1" || die "action failed on $filename: $*"
+			"do_$1" || die "action failed on '$fname': $* ($(print_flags))"
 			check_only=true
 			req "$@"
 			check_only=false
@@ -48,7 +61,7 @@ req() {
 
 
 check_p() {
-	test -d "$(dirname "$filename")"
+	test -d "$(dirname "$fname")"
 }
 
 do_p() {