From nobody Sun Mar 1 19:43:47 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 4fPCDf47m0z6TYZm for ; Sun, 01 Mar 2026 19:44:02 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) (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 4fPCDd6DQDz3wDb for ; Sun, 01 Mar 2026 19:44:01 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-c7103601c8cso1627041a12.2 for ; Sun, 01 Mar 2026 11:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772394239; x=1772999039; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=9rQsp5T60QgurXgWN5H9xC0vamO0UUsU36o4thf/tdI=; b=jKYyKsNrRsPiuBKEx9rq3v5L8CQ/QAdmuvuy+NRd0BNEybmRdXslH5IQtfGpTjgfV9 DSR/gdSEu6JYOBiYs2NPH3rRCWLazT9gYwGxNsKH1c1nXlbtZQ+xw9vY66fVf4coXhMa QyyO44pseF7rrULRl8GUyedjvN+JTBX3zKrqIX/C0o71CiUufjv9uBoQgWMcdGYz2YLO QQcgfLXO41aTLAU7yNa0qO7SPFBAgP3WQ34Xowcq2CfeipOl/0nXSh20FZE2+birfTUh /DGMquuhcZVAT75Lwge/BnGKtN/QDOSmgiKcJHLVK9tW9YrzRxYZxKoOTNKeEraGsNYA qkug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772394239; x=1772999039; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9rQsp5T60QgurXgWN5H9xC0vamO0UUsU36o4thf/tdI=; b=t4RszU7Ourjp2CUDc+ZKjQJM/gbRcaQyEk+ljmEKN4SnD65N/zy4URWs7uUlu1+fpT svaTIYkBQzrAtYAMbMIuSJE+xLAJWVXFHXB/6QUOEIP30INlO52nWEQinbv+U4svGSCE e92udNITTdTeI+PA0R0lytU95N8KEf1Oau5QxC/T0bdBQ8j0N1Oa98piuFYLSyi/EPEf aH+pzmPqUo9gbg2ldVYf6cOGB+oOR5XseosZ13tK07qQt5WYWN3sMKEwhcCWJoV1KjJ5 kncfL3ZZdO7hg6N6cMykfbprOidh4hIy+qdGCoEm68beet50XK1dFs9hSbsrQ6K6EUPe GbVw== X-Forwarded-Encrypted: i=1; AJvYcCWLsHHfaQWtvgoYWd9oduqGFtxhNf3QxhiYEz3sZv41WcP7UastYEP/IlWHgtf9kPQrHU6xb4PW6bJYoLET3lsCdnEc@freebsd.org X-Gm-Message-State: AOJu0YwQkFSRTdYkKKkC4FRN1kMnAISFg0oUBny3uhke2O+1beaN6u1G If2meN3bvZFBMQwL+sg8N9W7h3rx9RZBivRCu8VwsVZTzINqwF5c3SX1rKD04oms X-Gm-Gg: ATEYQzzEPFnbrwDtwr1x7ubEBUb4gpDXFUKIdxEfZOj8JhP8ahNqCeOl5d7ko5dnj+3 KNX+ANq6Mn8/nAdluRC/bTUR+2pIFW9gKG646fsQzQREZblgzw0wuBc+h67pQ0a6BtuUu/gXvnH B2NBWfeNE1boYyUNUGwNnd2N+I6oOJkEintAxjO/EScJYuiYFCbqYz0ivZccUnhgjUw1OPfFTYT q6GrxCKO8/yf+horwScxhg5qntSpbtBRO2mXi0qT9+90KjkdyJJ25xk3yYpjZRATlm1wmtuPzJW zx3U1+MzIFPdp6+bC41DmmOrBBS955quEY3Htk0nB7WdqEJTXu6OMFmaYpohq/z+nwvjm5VJuYD 2/b4yevK2Kaf3N6D43xID7mfqwoTcZCQIn/NdWXNThWWRg2IcpOBu2U1BW0l5MitTcExvl24rsG emsQ98kLqm38fAfneavruR3mnhCFwenghreMCCyKafvuI= X-Received: by 2002:a05:6a20:56a3:b0:38d:efcb:2e8a with SMTP id adf61e73a8af0-395c3b41486mr8297043637.68.1772394239054; Sun, 01 Mar 2026 11:43:59 -0800 (PST) Received: from smtpclient.apple ([185.219.141.150]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3593dda3a4dsm10357809a91.10.2026.03.01.11.43.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Mar 2026 11:43:58 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_78667708-B488-4AA4-BD1F-6C9BD2D71E76"; protocol="application/pgp-signature"; micalg=pgp-sha256 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 (Mac OS X Mail 16.0 \(3826.700.81.1.3\)) Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup From: "Enji Cooper (yaneurabeya)" In-Reply-To: <86ldgbny7e.fsf@ltc.des.dev> Date: Sun, 1 Mar 2026 11:43:47 -0800 Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: <3464A20F-B0F2-456E-8826-A43006457CC4@gmail.com> References: <86tsuzojnj.fsf@ltc.des.dev> <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> <86pl5nnzbx.fsf@ltc.des.dev> <86ldgbny7e.fsf@ltc.des.dev> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3826.700.81.1.3) 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: 4fPCDd6DQDz3wDb X-Spamd-Bar: ---- --Apple-Mail=_78667708-B488-4AA4-BD1F-6C9BD2D71E76 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 1, 2026, at 11:31=E2=80=AFAM, Dag-Erling Sm=C3=B8rgrav = wrote: >=20 > Warner Losh writes: >> Dag-Erling Sm=C3=B8rgrav writes: >>> 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. >=20 > This is diff3, not diff, and is not covered by POSIX. If we want to = be > fully compatible with GNU diff3, we should change all our error exits = to > 2 (they are currently a mix of 1 and 2), and exit 1 if and only if we > successfully found differences between the files. You=E2=80=99re right: please ignore this part of my earlier reply = because it=E2=80=99s not relevant to what you did in this change. Thanks, -Enji PS Please don=E2=80=99t change the diff3 code to sysexits(3). Like you = and Warner pointed out it doesn=E2=80=99t make sense to apply them to = this utility.= --Apple-Mail=_78667708-B488-4AA4-BD1F-6C9BD2D71E76 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmklvMACgkQGpE5DjPs NJhhCg//e4C2UgFIdhWkTnJn+ckn8bZCzVq4RMmkKZR2IUc7HuzTyYlG0VmLrTaT 7VXG6BNra8nBgmwqdClvMrFcRZ2Zy+OpW/pMHgnqXzuRlWasyQbrPHjRKkV0Y6V7 I6JYOe7XumngSFyuujCzC604KhGTAjM1nKXewfXnw55xouHzi7NG0yigjYi4bDBm dleb2d7n5Xz5lwXrDewqYuKj501eNNj5JA+54Sc46+FDSH/geurjh5J1ihTr63vJ v8fhMGVzsjYjDwxRyKJmZs55ytQopwQV2LEDGxJygOOabiNweWJnYl852yy/jf0n QXxuhOu3RdCEU5FN00NuYecvsGneMZBsxB563rcR/rbRQGMR7/JPD3qTu7Bk47bQ TQSbWS5sm07BNXXLfqGhiXhJ4yTYiM4Sl2zSZYkJJyDw8yFSiosOADfhpRgZVqfV XbmASgJUQwMCuZiH5yEwPWnvIjSt0nMMGVyJrA3od+KNG0RA7R+uTUTt2ZuP1Blo tC8oOQX28OPe2ZMkJH/MOvV+0fB7GOuLq4qNWpWhTQTCEKqKJgd+e4jXAIvkXoNK meBypKr4e3aUkRX6d6mCxPYg9wTnjF50W1+MCj8lme/lKHBPGhUi0bvatAYn4R/q 3oPPPGeei6s/glxgaxyXXKy2sV4C/zKGtFhqQ3yscgftYf9E3Zo= =4KCo -----END PGP SIGNATURE----- --Apple-Mail=_78667708-B488-4AA4-BD1F-6C9BD2D71E76--