From owner-freebsd-bugs@freebsd.org Sun Mar 1 04:53:49 2020 Return-Path: Delivered-To: freebsd-bugs@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DEBB124D577 for ; Sun, 1 Mar 2020 04:53:49 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48VWBj39lqz3GPW for ; Sun, 1 Mar 2020 04:53:49 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 3AFB324D576; Sun, 1 Mar 2020 04:53:49 +0000 (UTC) Delivered-To: bugs@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 38DF124D575 for ; Sun, 1 Mar 2020 04:53:49 +0000 (UTC) (envelope-from bugzilla-noreply@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48VWBh0WgVz3GMd for ; Sun, 1 Mar 2020 04:53:48 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7D22262C1 for ; Sun, 1 Mar 2020 04:53:47 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 0214rlYE031455 for ; Sun, 1 Mar 2020 04:53:47 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 0214rlkX031454 for bugs@FreeBSD.org; Sun, 1 Mar 2020 04:53:47 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 244533] [patch] diff(1) --label not honoured for "print_status" Date: Sun, 01 Mar 2020 04:53:47 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: CURRENT X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: jamie@catflap.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status bug_severity priority component assigned_to reporter attachments.mimetype attachments.created Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Mar 2020 04:53:49 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D244533 Bug ID: 244533 Summary: [patch] diff(1) --label not honoured for "print_status" Product: Base System Version: CURRENT Hardware: Any OS: Any Status: New Severity: Affects Some People Priority: --- Component: bin Assignee: bugs@FreeBSD.org Reporter: jamie@catflap.org Attachment #212065 text/plain mime type: Created attachment 212065 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D212065&action= =3Dedit patch to restore -label functionality Various options to "diff(1)" show filenames, and traditionally make use of = the "--label" parameter, if set. The BSD diff supports --label for unified and context diffs, but doesn't for these other cases. GNU diff, as previously installed in base did: % diff --label hello --label world -s /COPYRIGHT /COPYRIGHT Files /COPYRIGHT and /COPYRIGHT are identical % gdiff --label hello --label world -s /COPYRIGHT /COPYRIGHT Files hello and world are identical % diff --label hello --label world /bin/ls /bin/pwd Binary files /bin/ls and /bin/pwd differ % gdiff --label hello --label world /bin/ls /bin/pwd Binary files hello and world differ etc. The attached patch restores the previous behaviour. Cheers, Jamie --=20 You are receiving this mail because: You are the assignee for the bug.=