GNU bug report logs - #19509
[PATCH] diff: treat fifos as identical

Previous Next

Full log

View this message in rfc822 format

From: Ondřej Svoboda <ondrej <at> svobodasoft.cz>
To: 19509 <at> debbugs.gnu.org
Subject: bug#19509: [PATCH] diff: treat fifos as identical
Date: Sun, 04 Jan 2015 22:05:17 +0100

(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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.