Module Name: xsrc
Committed By: nia
Date: Sun May 29 06:06:14 UTC 2022
Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp
Log Message:
Avoid exec'ing bc. Pointed out by uwe.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xinit/dist/xinitrc.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.18 xsrc/external/mit/xdm/dist/config/Xsession.in:1.19
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.18 Sun May 29 05:53:02 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in Sun May 29 06:06:14 2022
@@ -1,6 +1,6 @@
XCOMM!SHELL_CMD
XCOMM
-XHASH $NetBSD: Xsession.in,v 1.18 2022/05/29 05:53:02 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.19 2022/05/29 06:06:14 nia Exp $
XCOMM redirect errors to a file in user's home directory if we can
@@ -101,7 +101,7 @@ if [ $fontsize -gt 18 ]; then
# of 96.
#
BINDIR/xrdb -merge - <<EOF
-Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin)
+Xft.dpi: $((96 * ($fontsize / 16)))
*VT100.faceName: xft:Monospace:pixelsize=$fontsize
EOF
elif [ $fontsize -gt 13 ]; then
Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.20 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.21
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.20 Sun May 29 05:53:02 2022
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp Sun May 29 06:06:13 2022
@@ -1,5 +1,5 @@
XCOMM!SHELL_CMD
-XHASH $NetBSD: xinitrc.cpp,v 1.20 2022/05/29 05:53:02 nia Exp $
+XHASH $NetBSD: xinitrc.cpp,v 1.21 2022/05/29 06:06:13 nia Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@@ -72,7 +72,7 @@ if [ $fontsize -gt 18 ]; then
# of 96.
#
XRDB -merge - <<EOF
-Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin)
+Xft.dpi: $((96 * ($fontsize / 16)))
*VT100.faceName: xft:Monospace:pixelsize=$fontsize
EOF
elif [ $fontsize -gt 13 ]; then
