Fix brotlibest, pd, xzbest, zipd

Author: vaeth

bin/brotlibest

@@ -27,29 +27,31 @@ ShortOpt() {
 last=false
 havearg=false
 for option
-do	if $last || $havearg
-	then	Push files "$option"
+do	if $havearg
+	then	Push options "$option"
 		havearg=false
 		continue
 	fi
-	case $option in
-	-)
+	if ! $last
+		then	case $option in
+		-)
 		Push files "$option";;
-	--)
-		last=:
-		continue;;
-	--lgwin*|--large_window*)
-		Push options "$option"
-		skip_calc=:
-		continue;;
-	--*)
-		Push options "$option"
-		continue;;
-	-*)
-		ShortOpt "$option"
-		Push options "$option"
-		continue;;
-	esac
+		--)
+			last=:
+			continue;;
+		--lgwin*|--large_window*)
+			Push options "$option"
+			skip_calc=:
+			continue;;
+		--*)
+			Push options "$option"
+			continue;;
+		-*)
+			ShortOpt "$option"
+			Push options "$option"
+			continue;;
+		esac
+	fi
 	Push files "$option"
 done
 

bin/pd

@@ -335,7 +335,7 @@ Dopack() {
 	if $tz4now
 	then	EchoCond "Creating $nameb"
 		OptExternal lz4best
-		"$lz4best" $quietopt "$nameb" "$destname.tar" \
+		"$lz4best" $quietopt "$destname.tar" "$nameb" \
 			|| Errunp 'lz4' "$nameb"
 	fi
 	Compare

bin/xzbest

@@ -88,7 +88,7 @@ then	Push options -$(( $maxlogmemory - 17 ))
 fi
 
 Xz() {
-	FilesizeLog 23
+	Filesizelog 23
 	if [ x"$file" = x'-' ]
 	then	"$l"  ${1+"$@"} -$(( $filesizelog - 17 ))e
 	else	"$l"  ${1+"$@"} -$(( $filesizelog - 17 ))e -- "$file"

bin/zipd

@@ -78,7 +78,7 @@ do	stat=0
 		fi
 	else	PushTopack || {
 			stat=2
-			Error $stat "not creating empty archive $archive"
+			Error $stat "not creating empty archive $name"
 		}
 	fi
 	[ $stat -eq 0 ] && \