From nobody Sun Mar 01 19:22:25 2026 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 4fPBm31MqKz6TXN1 for ; Sun, 01 Mar 2026 19:22:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) (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 4fPBm26NHzz3t1l for ; Sun, 01 Mar 2026 19:22:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-82746ed8cdcso2048449b3a.3 for ; Sun, 01 Mar 2026 11:22:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1772392957; cv=none; d=google.com; s=arc-20240605; b=aDx0eJS7jb+j9MaXEika2ASSrBxbWRBE7+eRvyRgIviECDvZRvbc2HavOMlWxturtI mBwDLtCoutfg1TS5nSth94qfXXGJS4ahFD1pEcCuLZbyoM66fR1h4WiBqyxSrcMAHxkf rmGQO0YLC20avy38d4ZgnmgT16zBcY6lHwY27+UcMbMVekQVexQsoIVpNvkkZzRw36l4 54SvI6YWHnayGRpnPviWiB2mZfP4OgmvsKeEfbGZKdKVZOv6OqeX3ZZo+LR/sY9r/+Lr Z7CAOksPRm/CNqMh0iJXZzoaGpxAF2Z0MSh5N71NGfjFpB+LYRDKcStt5ytssxSUzc/O JY/g== 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=MnxTQWN5px+FebpB1m5BOKhYUIO0gG9jGBKlN59lQLQ=; b=fH9ExHGIGhaojMCoAhk6PtGE363uCjT+asmEhkuDTKnqldggFZ4Ci5eKMyooArCKwa B+JBi/Q25pnYqk/90EqijGxE5+JGLT17QGJT081We3iGxEN9qZPBW1I3Pr16NUtTbIav jipd6KuDKOxWVzw3fn3a5w6GPytqfCjuiZFYi8lwRhMQMbFSzR981OSh+yrwwaDNWzyT NiXAzfZHJfSgAihC48+ZJeUi8nZxC7HUDjNahwUQ72mrNQpiPd+H8JE/ii1MZC+aMLta NT0Cw2sA1Maf1QeOOWcVzXk/03ltXHdKcOWBRdzUGiUy/0RlnOEHLFXdxJpD804SCOZl fK3A==; 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=XTvl8Hrrl1Y2sWveXDvdLmkgcmdaph8ukM5kTQC65yUifOMCqVhB050/c993Z2+vKF zM28DOK9qQ3OuSf8cFYkDMP5WIs+y2oFPLLnqeUaXGv2pf4SFNRZLvLczGYnOyrLnneP geI9JWze/gaWMxCsNpOMMvULZr0Me5+MvpRJD2eFmuANP5yQTTn8g2PB8gqQbALXWWF7 0ceD++8B18UF+KndS4JenUaYY8GDTYmniq3s+hw7KdwJrTjukiQ5ZDMNwvWA7lJI2LVe glUg0Q1weaZth3coml1QQkcG+y51vFT5N6q6BZUuL8WkPdgGD/oJ1Cy9L92BdrnVCoUp iIGw== X-Forwarded-Encrypted: i=1; AJvYcCVSmxOmOPlcLSDRY2OWOPBJwk02XfcEnH2qamaXea3Vgfe0Brq4/T3pZyCHh1Lk3WFG8WdEueRdq1chg0xaOKHLtsU/@freebsd.org X-Gm-Message-State: AOJu0YywTohpisetvrkVDnoTnGoWt8/H2C7dbhkaVsWd23qkFcXA/07W iS2hm10Q6+Weg7gJ8dEslbCBYPBtMoeQT8d6mAR6iMERl8//yGqPvmbOmeXH885Q+LeXg27wFBp atYYHOk7asSQ6Op8Di45TpJcIAzTK+4V7sjU8xshJ6w== X-Gm-Gg: ATEYQzx+kEMz1yyShiK2cnIGAFPd5nWnBfavCTcl3F3t8c03be+yYY7CH4UA7oxsRvK C8pkxdNQ25mknKFKTsEW2N41NWHzS4gNqN/faFQQIxxwVxd9B+Ycgn5GKB2fJlNGZ8Rs2Xn0jGh YXpFuINXO/wuZH+pxQiUshT3iVaHGSC+xmJbXURAQc/3tcrdmZzz6LKAWgI1Hqgy15BPQ+ORgND I+rhAglOagwSYustQXlZMXvIZS0yZgQcHIwi3oZsCdnTp1vnjEZYsG/0Moa/tjzBT7SS9QR18CC kZRwF3zlXsRvGFbW7g== 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 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 4fPBm26NHzz3t1l 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--