From nobody Thu Oct 01 08:08:03 2026 X-Original-To: dev-commits-src-branches@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 4hwPfr1RF1z6vFBf for ; Thu, 01 Oct 2026 08:08:04 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hwPfq6tvfz4bk2 for ; Thu, 01 Oct 2026 08:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790842084; 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=YFdbozDX8HdP0pWvwOFmGaOypJv6XGRoBs62hdka/Kw=; b=ultsqjFiqRBI62dN6XRPTmiV3uoL6RuROmZ/XdBuZiT4rSlyAONGRk2NmXdyB5W4dUZQni oMhCoYc0jzM0NfMZT2As5rBesLnmSrp80l+1sxmWlsfqfj49nl//hMnZhRMAafAMzOE1Rm 9z7zKgxqOQ2+JTFZa4/r3LibaaTlDUNNmkbK2VnvelTYgzN3TttQc0s/rtwNoSFIOsS/lO ZgaA8mBwTXwQQ0DENkvc9xbZbTZSD7tEnKWRN/mtIC8sYFDinQhtAvmPrUxQIH5l26kgCr AcgEkLkyG5rE9DHJ0z84FSNAEqmb9x8XuNGDqyBYHsc6TgKZ5dmy5cYDtQ2jMw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790842084; b=GRw+VL5+HKGRAd6Q6hhyEvErwgkgw6xi5naPRKcoWLgwIHripk2xCWYIEXoAEHTfRFdVqK xVSbJXh093LgzyYd5/6+YDZU9+qrOQ87c41lchVI9rIzwi9XGnAOanjt3BQvgtA05kSg/G yWoMl3eQRh3toj6x1KlDIAEbhuJ0oFUOnol0PQgP+76/UBv+nZxy6B22mbIESMUV8VytI8 4DMc7apLt+l3dI3SmA4nj1oqOd2PN2+fUbx174luSOx4uc2GRXboQolBd7a04JOFsANOlE SaCVDa/BFNQGMlHy6opv/IeNnxx0HxVQSEllyBjCeu5BXltt315Ft69GLrv9AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790842084; 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=YFdbozDX8HdP0pWvwOFmGaOypJv6XGRoBs62hdka/Kw=; b=FRBW543yjsvbzhMdyHyhCReNeKGUuq+ZgjqluJfd2cgGdSmUjr2IjORjcuqAjhqhQxpsv6 YO9nH834ZaeOmxNz7q7c3yd5LbYu+8DQFAbGAlbjRCOAIp3vCiEBzY4v5GGy1HnAsLEsKR A7x6TFlOHNrVsz5SzbKcOqsoz05v8cKImCAl2++EIYEFeYltiTQGpPZaNJBflVNYimzwVf nVfK0CO0rHCnbi/sYS9mdZEoGQRa8rj9LpR8Ybh2DzTYZAhElN+71SEjOp9+7x6+eNFtWp mFDQU57KFQYzGXUfSjxwcLPSTPulqi8DYQDMj7+3wMUMvy2p16V/DsDHAAezyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hwPfq5zRwzMfd for ; Thu, 01 Oct 2026 08:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23bc1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 08:08:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 2670aa4807f0 - stable/15 - sdiff.1: Document exit status and --help List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2670aa4807f04c484c4f5449b6fa25d98c4b8961 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 08:08:03 +0000 Message-Id: <6abe14e3.23bc1.3e322f1e@gitrepo.freebsd.org> The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=2670aa4807f04c484c4f5449b6fa25d98c4b8961 commit 2670aa4807f04c484c4f5449b6fa25d98c4b8961 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-09-23 14:19:05 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-10-01 08:07:56 +0000 sdiff.1: Document exit status and --help MFC after: 3 days Approved by: bnovkov (mentor) Sponsored by: fme AG Differential Revision: https://reviews.freebsd.org/D59927 (cherry picked from commit 14c7492637ec0644b5bb88da114e8cc76b9bf629) --- usr.bin/sdiff/sdiff.1 | 23 ++++++++++++++++++++++- usr.bin/sdiff/sdiff.c | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/usr.bin/sdiff/sdiff.1 b/usr.bin/sdiff/sdiff.1 index e228ece64331..ced741eec31e 100644 --- a/usr.bin/sdiff/sdiff.1 +++ b/usr.bin/sdiff/sdiff.1 @@ -3,7 +3,7 @@ .\" Written by Raymond Lai . .\" Public domain. .\" -.Dd February 16, 2024 +.Dd September 23, 2026 .Dt SDIFF 1 .Os .Sh NAME @@ -17,6 +17,8 @@ .Op Fl w Ar width .Ar file1 .Ar file2 +.Nm sdiff +.Fl -help .Sh DESCRIPTION .Nm displays two files side by side, @@ -85,6 +87,8 @@ Print a maximum of .Ar width characters on each line. The default is 130 characters. +.It Fl -help +Print the usage message and exit. .El .Pp Options passed to @@ -153,6 +157,23 @@ Specifies a directory for temporary files to be created. The default is .Pa /tmp . .El +.Sh EXIT STATUS +The +.Nm +utility exits with one of the following values: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It 0 +No differences were found. +.It 1 +Differences were found. +.It >1 +An error occurred. +.El +.Pp +The +.Fl -help +option exits with a status of 0. .Sh SEE ALSO .Xr cmp 1 , .Xr diff 1 , diff --git a/usr.bin/sdiff/sdiff.c b/usr.bin/sdiff/sdiff.c index b796bb4224a8..628e6cde46d9 100644 --- a/usr.bin/sdiff/sdiff.c +++ b/usr.bin/sdiff/sdiff.c @@ -117,6 +117,7 @@ static struct option longopts[] = { static const char *help_msg[] = { "usage: sdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1 file2\n", + " sdiff --help\n", "-l, --left-column: only print the left column for identical lines.", "-o OUTFILE, --output=OUTFILE: interactively merge file1 and file2 into outfile.", "-s, --suppress-common-lines: skip identical lines.",