From nobody Sat Oct 14 00:03:26 2023 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 4S6k9W0kmpz4x0w5; Sat, 14 Oct 2023 00:03:27 +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 4S6k9V6Cjdz3Plk; Sat, 14 Oct 2023 00:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697241806; 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=V8BK4NiJICFOSe+BERqKuntW/hIdRhT2YefDkvqo6aI=; b=n68JOEnETZlp3tVqcRwna6xouGLYdc1KfdOIiADrqLP3N8GMoLnTsGSRMzM8NVlbwMRa/7 o/W967n7cHSjHIzyTHVvYIaT2E6QIXsxeWcfNx1Nn3G1ZbcZbSA0MDyy8YWFCV+GKWbfE2 +jTYx5/ivKLxmc5GY/sQ/kqcAFlSZJ7kj/9DLOYwkkDYQgecCpLbVCvewvHri8OHEBc1bJ IJHvOrXBQu54dlocE6uWedSAVpA/d0TiKHUo2bdoBarDzFpc8W37TnBRbVvWpELK2UgTsM Z5OddJfnMyB1Jr0Pyuwa+km21HH7vwTHeoTzuLQUEmwStReCgXdoq5SjFgb2Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697241806; a=rsa-sha256; cv=none; b=pDyztIqD5eH5hGAwE8ToFOCc5CpfnEnGRgbeAKVObfRf60opiv1qU992pL1wV2MBHC8rSZ unZsj0ulx28LyocoXirNy6/TldD2YXqUtxE9MwJrQDQ34nKsP51wq1aah3wnG3dhbM4oUG alNZOoacJIjmn3sreeJJh0I5s+sGoduCX04eS3O6TF0c3Qyt8cWfVc1/zKRvho8IfXDtyI lKbc34W6x4FMNe5jFyRBXOWB+Sq+0d/Ue3rE2B5apxd2wc8N8AMfANV9xdb39bIulanjjF FvK+Y70AJsnKMptWMg/vmJC4olCGVx45xHsRMFYtJzfdslMXpmgE6xpazyoofg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697241806; 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=V8BK4NiJICFOSe+BERqKuntW/hIdRhT2YefDkvqo6aI=; b=HnOplqRMG35ehTe4X3l/cfSnCqLC04GJtGGZnfe9OH4QH4n41XMu19mo01Tlzo9/Yz7WnH nVzmQ8scT7cDK0EL+bH9Ec4N+qtbj0xqe/sX2B9Rmqaf9T9h29MQLI6tHOePPex+aGhbBO VOjXWABSyZCDjQolVYI1e0lNlyxC2wUyqRfjRgoqhYr+JVcSizDjXG7/VUW5Ky8uRtdFkf F8pMSY8JhWSfJ5nantJQYF8vKypuNsd3ahUeG2YxeXXwUXSezTSZ+spPYFDXk2oTFY5T8B HjzdMmJsAq2p1ZeWQdBz9VWWxdnZvYlSu97UeJ94evP82vQNmLeUSnaaHPFtZQ== 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 4S6k9V5JmQz17pg; Sat, 14 Oct 2023 00:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39E03Q1S050565; Sat, 14 Oct 2023 00:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39E03Qns050562; Sat, 14 Oct 2023 00:03:26 GMT (envelope-from git) Date: Sat, 14 Oct 2023 00:03:26 GMT Message-Id: <202310140003.39E03Qns050562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f0101a0ef9ad - releng/14.0 - sysctl: emit a newline after NULL node descriptions 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f0101a0ef9adac0d0ceb5b77de74f51cd24ea906 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f0101a0ef9adac0d0ceb5b77de74f51cd24ea906 commit f0101a0ef9adac0d0ceb5b77de74f51cd24ea906 Author: Ed Maste AuthorDate: 2023-10-06 18:00:30 +0000 Commit: Ed Maste CommitDate: 2023-10-13 23:18:14 +0000 sysctl: emit a newline after NULL node descriptions Previously when printing the sysctl description (via the -d flag) we omitted the newline if the node provided no description (i.e., NULL). This could be observed via e.g. `sysctl -d dev`. PR: 44034 Reviewed by: zlei Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42112 (cherry picked from commit 75be7e30271bb192fd27698982f2c7e56831eeef) (cherry picked from commit ced9fe051e31f858a9d1dbec01cf6dec483fab19) Approved by: re (gjb) --- sbin/sysctl/sysctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index fe1a53a9d645..7ed7be95c9a5 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -998,8 +998,10 @@ show_info(char *name, const char *sep, int ctltype, char *fmt, int *qoid, int nl bzero(buf, BUFSIZ); j = sizeof(buf); i = sysctl(qoid, nlen + 2, buf, &j, 0, 0); - if (i < 0) + if (i < 0) { + putchar('\n'); return (1); + } fputs(buf, stdout); return (error); }