aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorнаб <nabijaczleweli@nabijaczleweli.xyz>2022-02-18 13:34:40 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2022-03-05 19:56:11 +0000
commited87197672b44f7f76b38e6450df2b4071c88a67 (patch)
treef6ad024503222af12903b26cd849b4a1b8b2423c
parentd6132e2117b7f035a3d73b5cbb34d609aa58f212 (diff)
downloadsrc-ed87197672b44f7f76b38e6450df2b4071c88a67.tar.gz
src-ed87197672b44f7f76b38e6450df2b4071c88a67.zip
uname: -v: strip final whitespace compatibly with uname(3)
This restores POSIX.1 conformance PR: 260938 (cherry picked from commit 7e05fa3b449007adaa6e588ebb3b8d76f30b355c)
-rw-r--r--usr.bin/uname/uname.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index e97b9c3cb744..109505e4b9da 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -256,8 +256,12 @@ NATIVE_SYSCTL2_GET(version, CTL_KERN, KERN_VERSION) {
p = NATIVE_BUFFER;
n = NATIVE_LENGTH;
for (; n--; ++p)
- if (*p == '\n' || *p == '\t')
- *p = ' ';
+ if (*p == '\n' || *p == '\t') {
+ if (n > 1)
+ *p = ' ';
+ else
+ *p = '\0';
+ }
} NATIVE_SET;
NATIVE_SYSCTL2_GET(platform, CTL_HW, HW_MACHINE) {