From MAILER-DAEMON Fri Jan 02 01:35:07 2015 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Y6vpD-0001O7-LY for mharc-bug-diffutils@gnu.org; Fri, 02 Jan 2015 01:35:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6vpC-0001N3-2T for bug-diffutils@gnu.org; Fri, 02 Jan 2015 01:35:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y6vp8-00071t-IO for bug-diffutils@gnu.org; Fri, 02 Jan 2015 01:35:06 -0500 Received: from debbugs.gnu.org ([140.186.70.43]:53663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6vp8-00071k-FJ for bug-diffutils@gnu.org; Fri, 02 Jan 2015 01:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Y6vp8-00016d-4c for bug-diffutils@gnu.org; Fri, 02 Jan 2015 01:35:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Meyering Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Fri, 02 Jan 2015 06:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19489 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 19489@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.14201804594189 (code B ref -1); Fri, 02 Jan 2015 06:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jan 2015 06:34:19 +0000 Received: from localhost ([127.0.0.1]:34796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y6voQ-00015U-LG for submit@debbugs.gnu.org; Fri, 02 Jan 2015 01:34:18 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57971) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y6voO-00015M-NU for submit@debbugs.gnu.org; Fri, 02 Jan 2015 01:34:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y6voN-0006u4-ST for submit@debbugs.gnu.org; Fri, 02 Jan 2015 01:34:16 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:58816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6voN-0006u0-Qe for submit@debbugs.gnu.org; Fri, 02 Jan 2015 01:34:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6voN-0001JM-8J for bug-diffutils@gnu.org; Fri, 02 Jan 2015 01:34:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y6voM-0006tq-NG for bug-diffutils@gnu.org; Fri, 02 Jan 2015 01:34:15 -0500 Received: from mail-ig0-x236.google.com ([2607:f8b0:4001:c05::236]:35035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6voM-0006tg-IL for bug-diffutils@gnu.org; Fri, 02 Jan 2015 01:34:14 -0500 Received: by mail-ig0-f182.google.com with SMTP id hn15so15277148igb.9 for ; Thu, 01 Jan 2015 22:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to:content-type; bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; b=NaZhtPWwvOemXAP8TVkeoEftY+F1m9iud1tpai2pSnNda+1Z+B7zxwgOa8Pk02jGP/ fvGmQGpBBKd56ML3hFdlGBmZjzkbUPj2ZeHUfqc+BP6Wat79PKO6PHDOFzBBML7gd8C6 M0B3magOPcxCLoFrkCNfvMwVb3UREugj5eoskwbSK9HJYd6NBw+zsu8ulLxXyJbHqf+o FoRvK9CdKCMTuEzt1nhNxdj6MYdxnXROrIkgjsgJPJLx7UHBoAZF3d4LnjBboTcNE8qS dSQDeKRkgVpzZovpgu6rlk/oTS3dVTJnkVaUwKdgPmHm2fLMyZNy3MvPBB6zcv2s9M1m T7fw== X-Received: by 10.50.25.196 with SMTP id e4mr38272814igg.15.1420180453814; Thu, 01 Jan 2015 22:34:13 -0800 (PST) MIME-Version: 1.0 Received: by 10.64.107.197 with HTTP; Thu, 1 Jan 2015 22:33:53 -0800 (PST) From: Jim Meyering Date: Thu, 1 Jan 2015 22:33:53 -0800 X-Google-Sender-Auth: DzpsetEDGlNi2NpjEsMwOgzuVS4 Message-ID: Content-Type: text/plain; charset=ISO-8859-1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 Subject: [bug-diffutils] bug#19489: FYI: I've updated copyright dates -- and gnulib X-BeenThere: bug-diffutils@gnu.org List-Id: "All diffutils discussion." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jan 2015 06:35:06 -0000 From MAILER-DAEMON Sun Jan 04 16:30:09 2015 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Y7skT-0003tw-9v for mharc-bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:30:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7sec-0005WE-Nt for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:24:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y7seZ-0000R7-7k for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:24:06 -0500 Received: from debbugs.gnu.org ([140.186.70.43]:55531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7seZ-0000R3-4s for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:24:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Y7seY-0000U7-JD for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:24:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?Ond=C5=99ej?= Svoboda Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Sun, 04 Jan 2015 21:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19508 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: patch To: 19508@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.14204065951785 (code B ref -1); Sun, 04 Jan 2015 21:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jan 2015 21:23:15 +0000 Received: from localhost ([127.0.0.1]:36662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y7sdm-0000Sh-Nr for submit@debbugs.gnu.org; Sun, 04 Jan 2015 16:23:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33322) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y7s9l-00088R-6H for submit@debbugs.gnu.org; Sun, 04 Jan 2015 15:52:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y7s9j-0007vI-RK for submit@debbugs.gnu.org; Sun, 04 Jan 2015 15:52:12 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:49889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7s9j-0007vE-P0 for submit@debbugs.gnu.org; Sun, 04 Jan 2015 15:52:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7s9i-0005Gh-L0 for bug-diffutils@gnu.org; Sun, 04 Jan 2015 15:52:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y7s9b-0007rV-MM for bug-diffutils@gnu.org; Sun, 04 Jan 2015 15:52:10 -0500 Received: from kolbaba.stable.cz ([88.86.120.103]:58998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7s9b-0007qs-Fy for bug-diffutils@gnu.org; Sun, 04 Jan 2015 15:52:03 -0500 Received: from localhost (kolbaba.miton.cz [127.0.0.1]) by kolbaba.stable.cz (Postfix) with ESMTP id 01A6E2026E for ; Sun, 4 Jan 2015 21:52:00 +0100 (CET) X-Virus-Scanned: amavisd-new at kolbaba.stable.cz Received: from kolbaba.stable.cz ([127.0.0.1]) by localhost (kolbaba.stable.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9cnBxWDPXufa for ; Sun, 4 Jan 2015 21:51:56 +0100 (CET) Received: from [192.168.0.15] (155.198.broadband11.iol.cz [90.178.198.155]) by kolbaba.stable.cz (Postfix) with ESMTPSA id CD40520942 for ; Sun, 4 Jan 2015 21:51:56 +0100 (CET) Message-ID: <54A9A7E6.8020305@svobodasoft.cz> Date: Sun, 04 Jan 2015 21:51:50 +0100 From: =?UTF-8?Q?Ond=C5=99ej?= Svoboda User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Mailman-Approved-At: Sun, 04 Jan 2015 16:23:12 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-Mailman-Approved-At: Sun, 04 Jan 2015 16:30:07 -0500 Subject: [bug-diffutils] bug#19508: [PATCH] diff: compare major, minor numbers of block/character special files X-BeenThere: bug-diffutils@gnu.org List-Id: "All diffutils discussion." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jan 2015 21:24:07 -0000 This deals with situation such as File dev1/block1 is a block special file while file dev2/block1 is a block special file in case the major and minor numbers are identical. If stat.st_rdev does not match, a message is given: Block special files dev1/block1 and dev2/block1 differ: 1,2 (3,2) --- src/diff.c | 23 +++++++++++++++++++++++ src/diff.h | 1 + src/util.c | 9 +++++++++ 3 files changed, 33 insertions(+) diff --git a/src/diff.c b/src/diff.c index ff28377..a3e1b6f 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1276,6 +1276,29 @@ compare_files (struct comparison const *parent, status = EXIT_FAILURE; } } + else if ((S_ISBLK (cmp.file[0].stat.st_mode) + && S_ISBLK (cmp.file[1].stat.st_mode)) + || (S_ISCHR (cmp.file[0].stat.st_mode) + && S_ISCHR (cmp.file[1].stat.st_mode))) + { + if (cmp.file[0].stat.st_rdev != cmp.file[1].stat.st_rdev) + { + char major_minor0[20], major_minor1[20]; + format_major_minor (major_minor0, cmp.file[0].stat.st_rdev); + format_major_minor (major_minor1, cmp.file[1].stat.st_rdev); + + const char *message = S_ISBLK (cmp.file[0].stat.st_mode) ? + "Block special files %s and %s differ: %s (%s)\n" : + "Character special files %s and %s differ: %s (%s)\n"; + message5 (message, + file_label[0] ? file_label[0] : cmp.file[0].name, + file_label[1] ? file_label[1] : cmp.file[1].name, + major_minor0, major_minor1); + + /* This is a difference. */ + status = EXIT_FAILURE; + } + } else { /* We have two files that are not to be compared. */ diff --git a/src/diff.h b/src/diff.h index 465e4bc..098e75f 100644 --- a/src/diff.h +++ b/src/diff.h @@ -390,3 +390,4 @@ extern void print_script (struct change *, struct change * (*) (struct change *) extern void setup_output (char const *, char const *, bool); extern void translate_range (struct file_data const *, lin, lin, long int *, long int *); +extern void format_major_minor (char *buffer, const dev_t st_rdev); diff --git a/src/util.c b/src/util.c index 2d6d3fc..4773003 100644 --- a/src/util.c +++ b/src/util.c @@ -24,6 +24,7 @@ #include #include #include "xvasprintf.h" +#include char const pr_program[] = PR_PROGRAM; @@ -907,3 +908,11 @@ debug_script (struct change *sp) fflush (stderr); } + +/* Format a device number as major,minor. */ + +void +format_major_minor (char *buffer, const dev_t st_rdev) +{ + sprintf (buffer, "%u,%u", (major (st_rdev)), (minor (st_rdev))); +} -- 2.2.1 From MAILER-DAEMON Sun Jan 04 16:30:09 2015 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Y7skT-0003uP-Eq for mharc-bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:30:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7sej-0005Yg-TN for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:24:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y7seZ-0000RO-PP for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:24:13 -0500 Received: from debbugs.gnu.org ([140.186.70.43]:55533) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7seZ-0000RH-N9 for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:24:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Y7seZ-0000UM-Eh for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:24:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?Ond=C5=99ej?= Svoboda Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Sun, 04 Jan 2015 21:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19509 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: patch To: 19509@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.14204065951791 (code B ref -1); Sun, 04 Jan 2015 21:24:03 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jan 2015 21:23:15 +0000 Received: from localhost ([127.0.0.1]:36664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y7sdn-0000Sk-BB for submit@debbugs.gnu.org; Sun, 04 Jan 2015 16:23:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35549) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y7sMc-0008Sp-LH for submit@debbugs.gnu.org; Sun, 04 Jan 2015 16:05:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y7sMb-0003DV-PO for submit@debbugs.gnu.org; Sun, 04 Jan 2015 16:05:30 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:42118) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7sMb-0003DN-Ah for submit@debbugs.gnu.org; Sun, 04 Jan 2015 16:05:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7sMZ-0000B9-UW for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:05:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y7sMV-0003Cn-H2 for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:05:27 -0500 Received: from kolbaba.stable.cz ([88.86.120.103]:44373) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y7sMV-0003Ci-BS for bug-diffutils@gnu.org; Sun, 04 Jan 2015 16:05:23 -0500 Received: from localhost (kolbaba.miton.cz [127.0.0.1]) by kolbaba.stable.cz (Postfix) with ESMTP id BB1BE22CC3 for ; Sun, 4 Jan 2015 22:05:21 +0100 (CET) X-Virus-Scanned: amavisd-new at kolbaba.stable.cz Received: from kolbaba.stable.cz ([127.0.0.1]) by localhost (kolbaba.stable.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pmqzkzO6RpWr for ; Sun, 4 Jan 2015 22:05:18 +0100 (CET) Received: from [192.168.0.15] (155.198.broadband11.iol.cz [90.178.198.155]) by kolbaba.stable.cz (Postfix) with ESMTPSA id CB3F322BE9 for ; Sun, 4 Jan 2015 22:05:18 +0100 (CET) Message-ID: <54A9AB0D.1090900@svobodasoft.cz> Date: Sun, 04 Jan 2015 22:05:17 +0100 From: =?UTF-8?Q?Ond=C5=99ej?= Svoboda User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Mailman-Approved-At: Sun, 04 Jan 2015 16:23:12 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-Mailman-Approved-At: Sun, 04 Jan 2015 16:30:07 -0500 Subject: [bug-diffutils] bug#19509: [PATCH] diff: treat fifos as identical X-BeenThere: bug-diffutils@gnu.org List-Id: "All diffutils discussion." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jan 2015 21:24:17 -0000 (Continuation of the previous patch; may I ask the good people of the list to review both?) This avoids unwanted "differences" like File dev1/fifo1 is a fifo while file dev2/fifo1 is a fifo --- src/diff.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/diff.c b/src/diff.c index a3e1b6f..cf2c62a 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1299,6 +1299,11 @@ compare_files (struct comparison const *parent, status = EXIT_FAILURE; } } + else if (S_ISFIFO (cmp.file[0].stat.st_mode) + && S_ISFIFO (cmp.file[0].stat.st_mode)) + { + /* Both are fifos. */ + } else { /* We have two files that are not to be compared. */ -- 2.2.1