===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.118
retrieving revision 1.130
diff -u -r1.118 -r1.130
--- openbsd/fw_update/fw_install.sh	2021/12/24 00:46:02	1.118
+++ openbsd/fw_update/fw_install.sh	2021/12/25 18:22:38	1.130
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.118 2021/12/24 00:46:02 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.130 2021/12/25 18:22:38 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -40,6 +40,17 @@
 INSTALL=true
 LOCALSRC=
 
+unset FTPPID
+unset FWPKGTMP
+REMOVE_LOCALSRC=false
+cleanup() {
+	set +o errexit # ignore errors from killing ftp
+	[ "${FTPPID:-}" ] && kill -TERM -"$FTPPID" 2>/dev/null
+	[ "${FWPKGTMP:-}" ] && rm -rf "$FWPKGTMP"
+	"$REMOVE_LOCALSRC" && rm -rf "$LOCALSRC"
+}
+trap cleanup EXIT
+
 tmpdir() {
 	local _i=1 _dir
 
@@ -57,7 +68,7 @@
 }
 
 fetch() {
-	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit _error=''
+	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _exit _error=''
 
 	# If we're not in the installer,
 	# we have su(1) and doas(1) is unlikely to be configured.
@@ -67,19 +78,17 @@
 	"$VERBOSE" && flags=-vm
 	if [ -x /usr/bin/su ]; then
 		exec /usr/bin/su -s /bin/ksh "$_user" -c \
-		    "/usr/bin/ftp -D 'Get/Verify' $flags -o- '$_src'" > "$_dst"
+		    "/usr/bin/ftp -N '${0##/}' -D 'Get/Verify' $flags -o- '$_src'" > "$_dst"
 	else
 		exec /usr/bin/doas -u "$_user" \
-		    /usr/bin/ftp -D 'Get/Verify' $flags -o- "$_src" > "$_dst"
+		    /usr/bin/ftp -N "${0##/}" -D 'Get/Verify' $flags -o- "$_src" > "$_dst"
 	fi
-	) & _pid=$!
+	) & FTPPID=$!
 	set +o monitor
 
-	trap "kill -TERM '-$_pid' 2>/dev/null; exit 1" EXIT INT QUIT ABRT TERM
-
 	SECONDS=0
 	_last=0
-	while kill -0 -"$_pid" 2>/dev/null; do
+	while kill -0 -"$FTPPID" 2>/dev/null; do
 		if [[ $SECONDS -gt 12 ]]; then
 			set -- $( ls -ln "$_dst" 2>/dev/null )
 			if [[ $_last -ne $5 ]]; then
@@ -87,7 +96,7 @@
 				SECONDS=0
 				sleep 1
 			else
-				kill -INT -"$_pid"
+				kill -INT -"$FTPPID"
 				_error=" (timed out)"
 			fi
 		else
@@ -96,11 +105,11 @@
 	done
 
 	set +o errexit
-	wait "$_pid"
+	wait "$FTPPID"
 	_exit=$?
 	set -o errexit
 
-	trap "" EXIT INT QUIT ABRT TERM
+	unset FTPPID
 
 	if [ "$_exit" -ne 0 ]; then
 		rm -f "$_dst"
@@ -117,7 +126,7 @@
 	fi
 }
 
-devices_needing_firmware() {
+firmware_in_dmesg() {
 	local _d _m _line _dmesgtail _last='' _nl=$( echo )
 
 	# When we're not in the installer, the dmesg.boot can
@@ -153,7 +162,7 @@
 
 installed_firmware() {
 	local _pre="$1" _match="$2" _post="$3" _firmware
-	set -A _firmware -- $(
+	set -sA _firmware -- $(
 	    set +o noglob
 	    grep -Fxl '@option firmware' \
 		"${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \
@@ -168,25 +177,44 @@
 	done
 }
 
+detect_firmware() {
+	local _devices _last='' _d
+
+	set -sA _devices -- $(
+	    firmware_in_dmesg
+	    for _d in $( installed_firmware '*' '-firmware-' '*' ); do
+		echo "$( firmware_devicename "$_d" )"
+	    done
+	)
+
+	[ "${_devices[*]:-}" ] || return 0
+	for _d in "${_devices[@]}"; do
+		[[ $_last = $_d ]] && continue
+		echo $_d
+		_last="$_d"
+	done
+}
+
 add_firmware () {
 	local _f="${1##*/}" _pkgname
-	local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
+	FWPKGTMP="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
 	local flags=-VM
 	"$VERBOSE" && flags=-vm
-	ftp -D "Install" "$flags" -o- "file:${1}" |
-		tar -s ",^\+,${_tmpdir}/+," \
+	ftp -N "${0##/}" -D "Install" "$flags" -o- "file:${1}" |
+		tar -s ",^\+,${FWPKGTMP}/+," \
 		    -s ",^firmware,${DESTDIR}/etc/firmware," \
 		    -C / -zxphf - "+*" "firmware/*"
 
-	_pkgname="$( sed -n '/^@name /{s///p;q;}' "${_tmpdir}/+CONTENTS" )"
+	_pkgname="$( sed -n '/^@name /{s///p;q;}' "${FWPKGTMP}/+CONTENTS" )"
 	if [ ! "$_pkgname" ]; then
 		echo "Failed to extract name from $1, partial install" 2>&1
-		rm -rf "$_tmpdir"
+		rm -rf "$FWPKGTMP"
+		unset FWPKGTMP
 		return 1
 	fi
 
 	# TODO: Should we mark these so real fw_update can -Drepair?
-	ed -s "${_tmpdir}/+CONTENTS" <<EOL
+	ed -s "${FWPKGTMP}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation
 @option firmware
@@ -195,8 +223,9 @@
 w
 EOL
 
-	chmod 755 "$_tmpdir"
-	mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}"
+	chmod 755 "$FWPKGTMP"
+	mv "$FWPKGTMP" "${DESTDIR}/var/db/pkg/${_pkgname}"
+	unset FWPKGTMP
 }
 
 delete_firmware() {
@@ -241,51 +270,61 @@
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-d | -D | -L] [-av] [driver | file ...]"
+	echo "usage:  ${0##*/} [-d | -D] [-av] [-p path] [driver | file ...]"
 	exit 2
 }
 
 ALL=false
 OPT_D=
-OPT_L=
-while getopts :adDLv name
+while getopts :adDp:v name
 do
        case "$name" in
        a) ALL=true ;;
        d) DELETE=true ;;
        D) OPT_D=true ;;
-       L) OPT_L=true ;;
+       p) LOCALSRC="$OPTARG" ;;
        v) VERBOSE=true ;;
-       ?) echo "${0##*/}: unknown option -- -$OPTARG"; usage 2 ;;
+       :)
+	   echo "${0##*/}: option requires an argument -- -$OPTARG" >&2
+	   usage 2
+	   ;;
+       ?)
+	   echo "${0##*/}: unknown option -- -$OPTARG" >&2
+	   usage 2
+	   ;;
        esac
 done
 shift $((OPTIND - 1))
 
-[ "$OPT_D" ] && [ "$OPT_L" ] && usage 1
+if [ "$LOCALSRC" ]; then
+	if [[ $LOCALSRC = @(ftp|http?(s))://* ]]; then
+		FWURL="${LOCALSRC}"
+		LOCALSRC=
+	else
+		LOCALSRC="${LOCALSRC:#file:}"
+		! [ -d "$LOCALSRC" ] &&
+		    echo "The path must be a URL or an existing directory" >&2 &&
+		    exit 2
+	fi
+fi
 
+# "Download only" means local dir and don't install
 if [ "$OPT_D" ]; then
-	# "Download only" means local dir and don't install
 	INSTALL=false
-	LOCALSRC=.
-elif [ "$OPT_L" ]; then
-	# "Local" means don't download, install from local dir
+	LOCALSRC="${LOCALSRC:-.}"
+elif [ "$LOCALSRC" ]; then
 	DOWNLOAD=false
-	LOCALSRC=.
-else
-	LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
 fi
 
-CFILE="$LOCALSRC/$CFILE"
-
 if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
 	echo "need root privileges" >&2
 	exit 1
 fi
 
-set -A devices -- "$@"
+set -sA devices -- "$@"
 
 if "$DELETE"; then
-	[ "$OPT_D" ] || [ "$OPT_L" ] && usage 22
+	[ "$OPT_D" ] && usage 22
 
 	set -A installed
 	if [ "${devices[*]:-}" ]; then
@@ -324,11 +363,18 @@
 	exit
 fi
 
+if [ ! "$LOCALSRC" ]; then
+    LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
+    REMOVE_LOCALSRC=true
+fi
+
+CFILE="$LOCALSRC/$CFILE"
+
 if [ "${devices[*]:-}" ]; then
 	"$ALL" && usage 22
 else
 	"$VERBOSE" && echo -n "Detecting firmware ..."
-	set -A devices -- $( devices_needing_firmware )
+	set -sA devices -- $( detect_firmware )
 	"$VERBOSE" &&
 	    { [ "${devices[*]:-}" ] && echo " found." || echo " done." ; }
 fi
@@ -341,6 +387,10 @@
 	set -o noclobber
 	! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
 	    echo "Signature check of SHA256.sig failed" >&2 && exit 1
+elif [ ! -e "$CFILE" ]; then
+	# TODO: We shouldn't need a CFILE if all arguments are files.
+	echo "${0##*/}: $CFILE: No such file or directory" >&2
+	exit 2
 fi
 
 added=''