 @@ -1,16 +1,16 @@
 #!/bin/sh
-#	$NetBSD: certctl.sh,v 1.4.2.3 2023/09/06 15:04:33 martin Exp $
+#	$NetBSD: certctl.sh,v 1.4.2.4 2024/03/11 17:12:53 martin Exp $
+#
 # Copyright (c) 2023 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -20,27 +20,27 @@
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#
 set -o pipefail
 set -Ceu
-progname=$(basename -- "$0")
+progname=${0##*/}
 ### Options and arguments
 usage()
+{
 	exec >&2
 	printf 'Usage: %s %s\n' \
 	    "$progname" \
 	    "[-nv] [-C <config>] [-c <certsdir>] [-u <untrusted>]"
 	printf '               <cmd> <args>...\n'
 	printf '       %s list\n' "$progname"
 	printf '       %s rehash\n' "$progname"
 	printf '       %s trust <cert>\n' "$progname"
 @@ -266,28 +266,27 @@ list_default_trusted()
 			# or
 			# (b) the shell glob failed to match,
 			#     so ignore it and move on.
 			if [ ! -e "$cert" ]; then
 				if [ -h "$cert" ]; then
 					error "broken symlink: $vcert"
 					status=1
 				fi
 				continue
 			fi
 			# Print the vis-encoded absolute path to the
 			# certificate and base name on a single line.
-			vbase=$(basename -- "$vcert.")
+			vbase=${vcert##*/}
 			vbase=${vbase%.}
 			printf '%s %s\n' "$vcert" "$vbase"
 		done
 	done
+}
 # list_distrusted
+#
 #	List the vis-encoded certificate paths and their base names,
 #	separated by a space, for the certificates that have been
 #	distrusted by the user.
+#
 #	No order guaranteed; caller must sort.
+#
 @@ -329,28 +328,27 @@ list_distrusted()
 		case $cert in
 		/*)
 			;;
 		*)
 			vlink=$(printf '%s' "$link" | vis -M)
 			vcert=$(printf '%s' "$cert" | vis -M)
 			error "distrusted relative symlink: $vlink -> $vcert"
 			;;
 		esac
 		# Print the vis-encoded absolute path to the
 		# certificate and base name on a single line.
 		vcert=$(printf '%s' "$cert" | vis -M)
-		vbase=$(basename -- "$vcert.")
+		vbase=${vcert##*/}
 		vbase=${vbase%.}
 		printf '%s %s\n' "$vcert" "$vbase"
 	done
 	return $status
+}
 # list_trusted
+#
 #	List the trusted certificates, excluding the distrusted one, as
 #	one vis(3) line per certificate.  Reject duplicate base names,
 #	since we will be creating symlinks to the same base names in
 #	the certsdir.  Sorted lexicographically by vis-encoding.
+#
 @@ -552,39 +550,38 @@ cmd_trust()
 	# XXX Accept base name.
 	# vis the certificate path for terminal-safe error messages.
 	vcert=$(printf '%s' "$cert" | vis -M)
 	# Verify the certificate actually exists.
 	if [ ! -f "$cert" ]; then
 		error "no such certificate: $vcert"
 		return 1
 	fi
 	# Verify we currently distrust a certificate by this base name.
-	certbase=$(basename -- "$cert.")
+	certbase=${cert##*/}
 	certbase=${certbase%.}
 	if [ ! -h "$distrustdir/$certbase" ]; then
 		error "not currently distrusted: $vcert"
 		return 1
 	fi
 	# Verify the certificate we distrust by this base name is the
 	# same one.
 	target=$(readlink -n -- "$distrustdir/$certbase" && printf .)
 	target=${target%.}
 	if [ "$cert" != "$target" ]; then
-		vcertbase=$(basename -- "$vcert")
+		vcertbase=${vcert##*/}
 		error "distrusted $vcertbase does not point to $vcert"
 		return 1
 	fi
 	# Remove the link from the distrusted directory, and rehash --
 	# quietly, so verbose output emphasizes the distrust part and
 	# not the whole certificate set.
 	run rm -- "$distrustdir/$certbase"
 	$vflag && echo '# rehash'
 	vflag=false
 	rehash
+}
 @@ -607,28 +604,27 @@ cmd_untrust()
 	vcert=$(printf '%s' "$cert" | vis -M)
 	# Verify the certificate actually exists.  Otherwise, you might
 	# fail to distrust a certificate you intended to distrust,
 	# e.g. if you made a typo in its path.
 	if [ ! -f "$cert" ]; then
 		error "no such certificate: $vcert"
 		return 1
 	fi
 	# Check whether this certificate is already distrusted.
 	# - If the same base name points to the same path, stop here.
 	# - Otherwise, fail noisily.
-	certbase=$(basename "$cert.")
+	certbase=${cert##*/}
 	certbase=${certbase%.}
 	if [ -h "$distrustdir/$certbase" ]; then
 		target=$(readlink -n -- "$distrustdir/$certbase" && printf .)
 		target=${target%.}
 		if [ "$target" = "$cert" ]; then
 			$vflag && echo '# already distrusted'
 			return
 		fi
 		vcertbase=$(printf '%s' "$certbase" | vis -M)
 		vtarget=$(printf '%s' "$target" | vis -M)
 		error "distrusted $vcertbase at different path $vtarget"
 		return 1
 	fi