Mon Jul 12 19:03:20 2021 UTC ()

Revert 1.4, that just trades one problem for a different one
(splitting the message on % instead of white space, which affects
less messages, but makes a bigger mess of them when it happens).

The real problem is that the expansion of the message was unquoted,
which allowed the field splitting to happen at all (which was mitigated
by the way printf rescans its format string for each arg when there are
more args than conversions in the format) otherwise it would have been
a much bigger mess (both times).

Just add quotes where quotes are needed, no more splitting, all good.


(kre)

diff -r1.4 -r1.5 src/usr.sbin/sysinst/msg_xlat.sh

--- src/usr.sbin/sysinst/msg_xlat.sh 2021/07/11 10:51:46	1.4
+++ src/usr.sbin/sysinst/msg_xlat.sh 2021/07/12 19:03:20	1.5

 @@ -1,15 +1,15 @@
 #! /bin/sh
-#	$NetBSD: msg_xlat.sh,v 1.4 2021/07/11 10:51:46 cjep Exp $
+#	$NetBSD: msg_xlat.sh,v 1.5 2021/07/12 19:03:20 kre Exp $
 #-
 # Copyright (c) 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by David Laight.
+#
 # 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.
 @@ -164,27 +164,27 @@ do
 	# For our purposes, empty messages are the same as words without %
 	if [ $# -eq 0 ]; then set -- x; fi
 	if $count_fmtargs; then
 		echo $number $#
 		continue
 	fi
 	eval count=\${count_$number:-unknown}
 	if [ "$count" -ne $# ]; then
 		error "Wrong number of format specifiers in \"$sv_name\", got $#, expected $count"
 		$IGNORE_MISSING_TRANSLATIONS || rval=1
 	fi
 done
-IFS=%
+unset IFS
 if $count_fmtargs; then exit $rval; fi
 # Output the total number of messages and the offset of each in the file.
 # Use ascii numbers because generating target-ordered binary numbers
 # is just a smidgen tricky in the shell.
 offset=$(( 8 + $last_msg_number * 8 + 8 ))
 printf 'MSGTXTS\0%-7d\0' $last_msg_number
 msgnum=0
 while
 	msgnum=$(( $msgnum + 1 ))
 @@ -200,17 +200,17 @@ do
 	printf '%-7d\0' $offset
 	offset=$(( $offset + ${#msg} + 1 ))
 done
 # Finally output and null terminate the messages.
 msgnum=0
 while
 	msgnum=$(( $msgnum + 1 ))
 	[ "$msgnum" -le "$last_msg_number" ]
 do
 	eval msg=\${MSGTEXT_$msgnum}
 	if [ -z "$msg" ]; then continue; fi
-	printf '%s\0' $msg
+	printf '%s\0' "$msg"
 done
 exit $rval