From nobody Fri Feb 18 16:30:29 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0512419CD85D; Fri, 18 Feb 2022 16:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K0ccj6f4Mz3qV0; Fri, 18 Feb 2022 16:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645201829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+A8IYNKoLopvAFjlfZPko3zO56+DMXhYndUykKk+ItE=; b=CfGilzmaBRYebb0uaAAs7mn0bYOHrMmwMv8rQpgHccFnw7DaWXwvhQV338I+MCIME9+JL1 OGuc3u0Gyt09mWWKQRq5FNUzLIEDkIIG5vkTvrBMYRbfBExsSm06ZTftEflMyELsFO5EM+ 5gMY9CVICD2Sbywye9kZ/69zH5f/e71v0nFiUUauK2CVfoOB+q1heuhNygDeq04iMlDWnK Fl+vxoRONkZDHO0tHZ5VPPevuYcZPSba/+et11CAgRxXMyy0OxakGzr6yRpD0dlfrBuLGt xQa+uiwMwl3XDIsuzENzUmiR1Ug1b9dWsEj15QbNEEig4ZCsiN0GKSkgq/c4Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C0B6A209AE; Fri, 18 Feb 2022 16:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21IGUT9Z008424; Fri, 18 Feb 2022 16:30:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21IGUTAN008423; Fri, 18 Feb 2022 16:30:29 GMT (envelope-from git) Date: Fri, 18 Feb 2022 16:30:29 GMT Message-Id: <202202181630.21IGUTAN008423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 7e05fa3b4490 - main - uname: -v: strip final whitespace compatibly with uname(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e05fa3b449007adaa6e588ebb3b8d76f30b355c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645201829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+A8IYNKoLopvAFjlfZPko3zO56+DMXhYndUykKk+ItE=; b=gLzO+KIR3IBqJH2ez4ewvCMGFG3c4o3ToJYxQesAW78acG+bmnARxP+vVGP3jh4AMXDm4e M83KK4A46P1Jh7RR6320zKeUc34faNavQuhHpvn1GMMiJdWsz6WoSV6HcbVlvHI8O53Rzq tt/NKuyBd3VyHFOJcc+Hf9FEMX6M7n+Ys1chQjWUevhqEpLZOncBgGiD0sg3j6LJdfcH9H W+zMBiuXu+/qJdPm/gbXfKTX99BswZyjDUN9Lk1myYmES3gvmx2e4dATK1oaSZu8S2H9FZ qgIZYEAjO0Tpqv7j8DJNws2TlnTYq0dLCih7LWJ7jZpSNcMTh4aT7l5cTBJ//w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645201829; a=rsa-sha256; cv=none; b=QZurAZ+G7JCTnSQmLUKoD2dpEl2cDwr+XBblJgeGNlk0nQjh9He1u/e3apVIYnm2VGnjvO BlhHAS7px5YZ/nBwmjAB7zInEyCpxRLpXXlAb6NFNDBpNaH32FDxWiCYuZYw9b47kjNc16 oFjPunroo8DWTF2c2qbLl+WFiRiS1DY5cgHyfPygvrcYe2aO1GGhgl3l11oAj5UVcM0cVH AjzFrFTtaJVauS0lKi9sU7apIuvq9cuLtSvhXI4hYIwaEt9J72UtdZZ6pmj9nynDVVzVEV Roel2/XWq0KdgPYWIssFvAmB+a676Gd/WlESPX/6hQMtn4ekDWSuL/032pZI9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=7e05fa3b449007adaa6e588ebb3b8d76f30b355c commit 7e05fa3b449007adaa6e588ebb3b8d76f30b355c Author: наб AuthorDate: 2022-02-18 13:34:40 +0000 Commit: Mateusz Guzik CommitDate: 2022-02-18 16:30:10 +0000 uname: -v: strip final whitespace compatibly with uname(3) This restores POSIX.1 conformance PR: 260938 --- usr.bin/uname/uname.c | 8 ++++++-- 1 file 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) {