 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: postinstall,v 1.144 2012/08/14 13:11:24 apb Exp $
+# $NetBSD: postinstall,v 1.145 2012/08/15 12:48:19 apb Exp $
+#
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Luke Mewburn.
+#
 # 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
 @@ -45,26 +45,27 @@
 #	  dhclient.conf, ...) ?
 #	- support quiet/verbose mode ?
 #	- differentiate between failures caused by missing source
 #	  and real failures
 #	- install moduli into usr/share/examples/ssh and use from there?
 #	- differentiate between "needs fix" versus "can't fix" issues
+#
 # This script is executed as part of a cross build.  Allow the build
 # environment to override the locations of some tools.
 : ${AWK:=awk}
 : ${DB:=db}
 : ${GREP:=grep}
 : ${HOST_SH:=sh}
 : ${MAKE:=make}
 : ${PWD_MKDB:=/usr/sbin/pwd_mkdb}
 : ${STAT:=stat}
+#
 #	helper functions
+#
 err()
+{
 	exitval=$1
 	shift
 	echo 1>&2 "${PROGNAME}: $*"
 @@ -1729,43 +1730,74 @@ do_obsolete()
 additem ptyfsoldnodes "remove legacy device nodes when using ptyfs"
 do_ptyfsoldnodes()
+{
 	[ -n "$1" ] || err 3 "USAGE: do_ptyfsoldnodes  fix|check"
 	_ptyfs_op="$1"
 	# Check whether ptyfs is in use
 	failed=0;
 	if ! ${GREP} -E "^ptyfs" "${DEST_DIR}/etc/fstab" > /dev/null; then
 		msg "ptyfs is not in use"
 		return 0
 	fi
 	# Find the device major numbers for the pty master and slave
 	# devices, by parsing the output from "MAKEDEV -s pty0".
+	#
 	# Output from MAKEDEV looks like this:
 	# ./ttyp0 type=char device=netbsd,5,0 mode=666 gid=0 uid=0
 	# ./ptyp0 type=char device=netbsd,6,0 mode=666 gid=0 uid=0
+	#
 	# Output from awk, used in the eval statement, looks like this:
 	# maj_ptym=6; maj_ptys=5;
+	#
 	eval "$(
 	    ${HOST_SH} "${DEST_DIR}/dev/MAKEDEV" -s pty0 2>/dev/null \
 	    | ${AWK} '\
 	    BEGIN { before_re = ".*device=[a-zA-Z]*,"; after_re = ",.*"; }
 	    /ptyp0/ { maj_ptym = gensub(before_re, "", 1, $0);
 		      maj_ptym = gensub(after_re, "", 1, maj_ptym); }
 	    /ttyp0/ { maj_ptys = gensub(before_re, "", 1, $0);
 		      maj_ptys = gensub(after_re, "", 1, maj_ptys); }
 	    END { print "maj_ptym=" maj_ptym "; maj_ptys=" maj_ptys ";"; }
+	    '
 	    )"
 	#msg "Major numbers are maj_ptym=${maj_ptym} maj_ptys=${maj_ptys}"
 	if [ -z "$maj_ptym" ] || [ -z "$maj_ptys" ]; then
 		msg "Cannot find device major numbers for pty master and slave"
 		return 1
 	fi
 	# look for /dev/[pt]ty[p-zP-T][0-9a-zA-Z], and check that they
-	# are tty or pty device nodes.  ttyv* is typically not a
+	# have the expected device major numbers.  ttyv* is typically not a
 	# pty device, but we check it anyway.
+	#
 	# The "for d1" loop is intended to avoid overflowing ARG_MAX;
 	# otherwise we could have used a single glob pattern.
+	#
 	# If there are no files that match a particular pattern,
 	# then stat prints something like:
 	#    stat: /dev/[pt]tyx?: lstat: No such file or directory
 	# and we ignore it.  XXX: We also ignore other error messages.
+	#
 	_ptyfs_tmp="$(mktemp /tmp/postinstall.ptyfs.XXXXXXXX)"
 	for d1 in p q r s t u v w x y z P Q R S T; do
-		${STAT} -f "%SHr %N" "${DEST_DIR}/dev/"[pt]ty${d1}? 2>&1
+		${STAT} -f "%Hr %N" "${DEST_DIR}/dev/"[pt]ty${d1}? 2>&1
 	done \
-	| ${AWK} '/^[pt]ty/ {print $2}' >"${_ptyfs_tmp}"
+	| while read -r major node ; do
 		case "$major" in
 		${maj_ptym}|${maj_ptys}) echo "$node" ;;
 		esac
 	done >"${_ptyfs_tmp}"
 	_desc="legacy device node"
 	while read node; do
 		if [ "${_ptyfs_op}" = "check" ]; then
 			msg "Remove ${_desc} ${node}"
 			failed=1
 		else # "fix"
 			if rm "${node}"; then
 				msg "Removed ${_desc} ${node}"
 			else
 				warn "Failed to remove ${_desc} ${node}"
 				failed=1
 			fi