From nobody Sun Mar 1 19:22:25 2026 X-Original-To: dev-commits-src-main@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 4fPBm33rrcz6TXg0 for ; Sun, 01 Mar 2026 19:22:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPBm30Mmdz3t44 for ; Sun, 01 Mar 2026 19:22:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-82735a41985so2121138b3a.2 for ; Sun, 01 Mar 2026 11:22:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1772392957; cv=none; d=google.com; s=arc-20240605; b=bXSDQsjsBNJZKv7NTwuI8Nn51wYoXK4C//cx6mgwLOCuoEQhueimZswEb39MVtYwbB A6FNNypmOO1GFyh/8EaNmGpMjW5hrkN0S2v1Y8lYXXJ2uMaMAPPfCAIPdFXJHQ6z34bS heDtR1v06hC228E5cOEFT+1c/wqO7/SXUPDtcd8LuJOl2KBe6Q304+15JXfPagKOAyr+ ClsXovXwnD2bQuDGDd46oG+2bvIJT0PT8cW1GboWWHAyGV80kqj7en0GGRxjmxO5yqPt fcNlluPlW26YR2KSb6Ru+39l9nY/+SA18K9IIKjhq/aufF3LLJnd0blDJg+ufoP97cjs i8EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=ufrLQuvpX00unka40YT9ori0Ua8cLA1FyH9er7qzPfY=; fh=H+2vp78v/4LUNN8Zj0asBi8vIThI/ZHUsc3q1DbUAoM=; b=O5pCID/pNn2j9P3RkUtZxFeHVvD7xNtSF3k/8ubiamTmQ3lr5n4wG6KCNOb2FE0mK1 lEeEZUggV2sbko80qLRXewmKzShySVQtbCfWONKL4bHP3ldSkK9JK2Oe/XWuxYpXusLy p+fTKpC6DSiIK0KqxJnvvLctm6SGqAvSGm9TUkWMavY1JvBMeIkt8Uf/9cQNH+jpiAfi +G4OXxxiiHsQ7BDRmcXwfM78Y9wpvOI3qIo99qXfp5gajc87H+8OdHWeYpCXs7Mo5XAH S7bqj8yu77yIFnztnx9fYzSWgppvIrwvBpkpBVpHNxtD/n8wuMIMdt2SWy8HsYMPBrsi YXjw==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1772392957; x=1772997757; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ufrLQuvpX00unka40YT9ori0Ua8cLA1FyH9er7qzPfY=; b=y49jUsIysF5LHBHnVVatY97U6UzrApOR50lipIr1Nz2n6DNaLO96Akv0SZChTveCOZ tfTQIsSDS9UTb2SpDjWmYRugZt0lKevTkv42GQ/ic9AX2YcO/N0gyGe1yzlIpm6KhUB+ adcOICncGkNs2+r9lZqoHgFTBkCAHU/N21Rf8jjYH20vbeAx/IuYwUeaqVr6rjUw3toz zCHY3F7OY5nU3U8D0hjNpscqD+YxElYXERgXJmqPpjivHtgFwPzPPbWTXqNvijaOFzCQ wGkbpNTeqqbqYhlscxtnQ4JNrFs+66swR4tgDTgKrMzjmyQPvVbuD5daaon9p7MYOIeG fcYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772392957; x=1772997757; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ufrLQuvpX00unka40YT9ori0Ua8cLA1FyH9er7qzPfY=; b=me+UxBz/3LONW1YdImWuKmu3Tbmj+s3/Ecad2D8JpY7hCrUY17GYjYr/tav0PtIgcn K5soJjUszS0sSTfe2M9dCB7VIgdbjmplSfbT4Kv96YZiKIIKc8unhKYSRoTBTdR8Jefn DjjejkGUNAyq+4Redli4qRr/EzfuUeoe5vTIxCg78PbxZ6z1GAv/mvZ/Y3tc9mSMy/ys FegrEh13vCqh/8JxruyvanlJBnwBNTRSQZ1jHjmvEnbxfysJ2+rArFKPPuqfKgSQ3/sv 6tMJtBNysAnVL2Zxv/ilIsTjPFmQaBWVcuJAa7ERA2a9gP9Z39IpN5gkb+f12TuiazCh Ms+g== X-Forwarded-Encrypted: i=1; AJvYcCVJ7RJb4m9ZyaZoppbLkdmcxykjc+1CM3Iu903l+df0SsOgruUlWIgblvS4vk+a166VChoTp7OqVTzq1wwARUUP/T5zvg==@freebsd.org X-Gm-Message-State: AOJu0YyZB9eDtiw+HwD4DHLVOWSDiBzj9Fkg3zhmOnnShNV+ycYkEU3E QxDMzRtxf1r8tBclutufQrV+VxXJZxMt4SlZvaclPFyQml9u0UrW7KsHYyEeFxbTsHxtq1q1oII 0E07JOtMVbrvx1YYgJk8rAqFodXS2ZoZiRJkqG+47pO+W6c6pYBlt7x8= X-Gm-Gg: ATEYQzyVMD4iITO7AwctkwXs77XWnjx8SbZUPKRtoWIoG1RhEYqQ5W2/3/CaPC9OY1F TVEI2YaFwYW1k5CggYU4bCTDQwb9p+R/CameOxB5J2Dmmm3Rlbyn1nkV1KN40FxtEahp4cx1z+U tA2sQtLvhkmn3UbT76FWuzUovn8TOsAIqCcjXBVH+OrRvOAVcC+CBUHwtyQYrHHUfbzP/DTkmcJ IA0bUUSKtNU/ZDv45p0JDNMEmbog7sf0oNC0aAOHde1u8IDkBfIVvf9WiOdTfgrdQQuilOoWkXf tUUNnmfWfj+A1m/NYw== X-Received: by 2002:a05:6a20:3946:b0:366:14ac:8c70 with SMTP id adf61e73a8af0-395c3b50264mr9453152637.70.1772392956751; Sun, 01 Mar 2026 11:22:36 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <86tsuzojnj.fsf@ltc.des.dev> <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> <86pl5nnzbx.fsf@ltc.des.dev> In-Reply-To: <86pl5nnzbx.fsf@ltc.des.dev> From: Warner Losh Date: Sun, 1 Mar 2026 12:22:25 -0700 X-Gm-Features: AaiRm509KK0UvuYImE-L0MGQM8CpurerVVlE6aJ0DQugi7S4fBMFPTFcSIY1QWk Message-ID: Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: Enji Cooper , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000096febf064bfb64e5" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fPBm30Mmdz3t44 X-Spamd-Bar: ---- --00000000000096febf064bfb64e5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Mar 1, 2026 at 12:07=E2=80=AFPM Dag-Erling Sm=C3=B8rgrav wrote: > Enji Cooper writes: > > I wasn=E2=80=99t aware that their version didn=E2=80=99t really work; t= he RCS Id in > > the file was ancient, hence the question about reconciling with > > OpenBSD (I thought there was a chance that we could maybe leverage > > some of their code/fixes in the future to reduce maintenance effort). > > I think the opposite would be more likely. The only functional changes > to OpenBSD's diff3 since the version recorded in our copy was to fix > issues with inputs that don't end in a newline. > > > About the sysexits change: is there a reason why it was made? I=E2=80= =99m > > asking because another recent change made by an external contributor > > introduced sysexits use, whereas this change removed it. > > EXIT_SUCCESS and EXIT_FAILURE are not sysexits, they are ISO C aliases > for 0 and 1. They were only used in three places, while the rest of the > code used 0, 1, or 2. I'm not opposed to switching to sysexits, but I > don't really see any benefit. > Nor I. Aren't the current valutes mandated by POSIX or by what POSIX mandates diff return though? Switching to sysexits would make that harder since they don't align well with POSIX requirements. Warner --00000000000096febf064bfb64e5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sun, Mar 1, = 2026 at 12:07=E2=80=AFPM Dag-Erling Sm=C3=B8rgrav <des@freebsd.org> wrote:
Enji Cooper <yaneurabeya@gmail.com> writes:
> I wasn=E2=80=99t aware that their version didn=E2=80=99t really work; = the RCS Id in
> the file was ancient, hence the question about reconciling with
> OpenBSD (I thought there was a chance that we could maybe leverage
> some of their code/fixes in the future to reduce maintenance effort).<= br>
I think the opposite would be more likely.=C2=A0 The only functional change= s
to OpenBSD's diff3 since the version recorded in our copy was to fix issues with inputs that don't end in a newline.

> About the sysexits change: is there a reason why it was made? I=E2=80= =99m
> asking because another recent change made by an external contributor > introduced sysexits use, whereas this change removed it.

EXIT_SUCCESS and EXIT_FAILURE are not sysexits, they are ISO C aliases
for 0 and 1.=C2=A0 They were only used in three places, while the rest of t= he
code used 0, 1, or 2.=C2=A0 I'm not opposed to switching to sysexits, b= ut I
don't really see any benefit.

Nor I= . Aren't the current valutes mandated by POSIX or by what POSIX mandate= s
diff return though? Switching to sysexits would make that harde= r since they don't
align well with POSIX requirements.
<= div>
Warner=C2=A0
--00000000000096febf064bfb64e5--