[Bug 252614] /usr/bin/diff : BUG: Incorrectly displaying files as duplicates (includes fix)

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252614

--- Comment #4 from commit-hook at FreeBSD.org ---
A commit in branch stable/13 references this bug:

URL:
https://cgit.FreeBSD.org/src/commit/?id=3728c4d3149553967532a97254737bdb2cd92417

commit 3728c4d3149553967532a97254737bdb2cd92417
Author:     Jamie Landeg-Jones <jamie at catflap.org>
AuthorDate: 2021-01-25 17:42:26 +0000
Commit:     Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-02-01 13:05:25 +0000

    diff: fix incorrectly displaying files as duplicates

    When diff hits certain access errors, function diffreg() shows the error
    message, and then returns to the calling function, which calls
    print_status() with the return value.

    However, in these cases, the return value isn't changed from the initial
    default value of D_SAME.

    Normally, print_status() with a value of D_SAME does nothing, so this
    works out ok, however, if the "-s" flag is set, a message is displayed
    showing identicality:

    case D_SAME:
                    if (sflag)
                            printf("Files %s%s and %s%s are identical\n",      
                                                                               
                path1, entry, path2, entry);
                    break;

    This then produces such results as:

    % diff  -s /COPYRIGHT /var/run/rpcbind.sock
    diff: /var/run/rpcbind.sock: Operation not supported
    Files /COPYRIGHT and /var/run/rpcbind.sock are identical

    % diff  -s /COPYRIGHT /etc/master.passwd
    diff: /etc/master.passwd: Permission denied
    Files /COPYRIGHT and /etc/master.passwd are identical

    Create a D_ERROR status which is returned in such cases, and
    print_status() then deals with that status seperately from D_SAME

    PR:             252614
    MFC after:      1 week

    (cherry picked from commit fefb3c46a80fdde6f307e73a2b5b5aed806df1ce)

 usr.bin/diff/diff.c    | 2 ++
 usr.bin/diff/diff.h    | 1 +
 usr.bin/diff/diffreg.c | 5 +++++
 3 files changed, 8 insertions(+)

-- 
You are receiving this mail because:
You are the assignee for the bug.