From MAILER-DAEMON Wed May 18 14:48:42 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QMlnW-0000Wg-1u
	for mharc-bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:42 -0400
Received: from eggs.gnu.org ([140.186.70.92]:49378)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnT-0000Vf-QM
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnT-0006C3-1N
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:39 -0400
Received: from mx.meyering.net ([82.230.74.64]:35118)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnS-0006Bq-S6
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:38 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 302B76010F; Wed, 18 May 2011 20:48:38 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Wed, 18 May 2011 20:48:32 +0200
Message-Id: <1305744515-12723-2-git-send-email-jim@meyering.net>
X-Mailer: git-send-email 1.7.5.1
In-Reply-To: <1305744515-12723-1-git-send-email-jim@meyering.net>
References: <1305744515-12723-1-git-send-email-jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 82.230.74.64
Subject: [bug-diffutils] [PATCH 1/4] maint: don't use now-removed gnulib
	"exit" module
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 May 2011 18:48:40 -0000

From: Jim Meyering <meyering@redhat.com>

* bootstrap.conf (gnulib_modules): Remove "exit" module.
It no longer exists.
---
 bootstrap.conf |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 1d8105c..e00ff2b 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -27,7 +27,6 @@ do-release-commit-and-tag
 dup2
 error
 exclude
-exit
 exitfail
 extensions
 fcntl
-- 
1.7.5.1.341.g177b8



From MAILER-DAEMON Wed May 18 14:48:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QMlnX-0000XC-3n
	for mharc-bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:43 -0400
Received: from eggs.gnu.org ([140.186.70.92]:49402)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnU-0000Vh-LD
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnT-0006C8-1a
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:40 -0400
Received: from mx.meyering.net ([82.230.74.64]:35117)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnS-0006Bo-S8
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:39 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 2355260158; Wed, 18 May 2011 20:48:38 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Wed, 18 May 2011 20:48:31 +0200
Message-Id: <1305744515-12723-1-git-send-email-jim@meyering.net>
X-Mailer: git-send-email 1.7.5.1
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 82.230.74.64
Subject: [bug-diffutils] keep up with gnulib and tight-scope
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 May 2011 18:48:41 -0000

Factoring out README-release, now that it's in gnulib,
using gnulib's new tight-scope rule and removing our
use of its now-removed exit module:

[PATCH 1/4] maint: don't use now-removed gnulib "exit" module
[PATCH 2/4] maint: prepare for the tight-scope check
[PATCH 3/4] build: update gnulib submodule to latest
[PATCH 4/4] maint: use gnulib's new readme-release module


From MAILER-DAEMON Wed May 18 14:48:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QMlnX-0000XV-5W
	for mharc-bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:43 -0400
Received: from eggs.gnu.org ([140.186.70.92]:49421)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnV-0000Vo-Bt
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnT-0006CJ-CV
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:41 -0400
Received: from mx.meyering.net ([82.230.74.64]:35119)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnT-0006Bt-3Y
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:39 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 53B90602E7; Wed, 18 May 2011 20:48:38 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Wed, 18 May 2011 20:48:34 +0200
Message-Id: <1305744515-12723-4-git-send-email-jim@meyering.net>
X-Mailer: git-send-email 1.7.5.1
In-Reply-To: <1305744515-12723-1-git-send-email-jim@meyering.net>
References: <1305744515-12723-1-git-send-email-jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 82.230.74.64
Subject: [bug-diffutils] [PATCH 3/4] build: update gnulib submodule to latest
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 May 2011 18:48:42 -0000

From: Jim Meyering <meyering@redhat.com>

---
 gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnulib b/gnulib
index 81aea5d..2c25c9e 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 81aea5d9bec07d25f49b227d80605f46986397b5
+Subproject commit 2c25c9ebe8db1415bfde25f0a451767332c8cf59
-- 
1.7.5.1.341.g177b8



From MAILER-DAEMON Wed May 18 14:48:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QMlnX-0000Xj-7I
	for mharc-bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:43 -0400
Received: from eggs.gnu.org ([140.186.70.92]:49419)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnV-0000Vm-6w
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnT-0006CV-F7
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:41 -0400
Received: from mx.meyering.net ([82.230.74.64]:35120)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnT-0006Bw-3W
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:39 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 6994A60429; Wed, 18 May 2011 20:48:38 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Wed, 18 May 2011 20:48:35 +0200
Message-Id: <1305744515-12723-5-git-send-email-jim@meyering.net>
X-Mailer: git-send-email 1.7.5.1
In-Reply-To: <1305744515-12723-1-git-send-email-jim@meyering.net>
References: <1305744515-12723-1-git-send-email-jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 82.230.74.64
Subject: [bug-diffutils] [PATCH 4/4] maint: use gnulib's new readme-release
	module
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 May 2011 18:48:42 -0000

From: Jim Meyering <meyering@redhat.com>

* bootstrap.conf (gnulib_modules): Add readme-release.
(bootstrap_epilogue): Add the recommended perl one-liner.
* README-release: Remove file; it is now generated from gnulib.
* .gitignore: Add it.
---
 .gitignore     |    2 +
 README-release |   83 --------------------------------------------------------
 bootstrap.conf |    2 +
 3 files changed, 4 insertions(+), 83 deletions(-)
 delete mode 100644 README-release

diff --git a/.gitignore b/.gitignore
index b5c2b2c..bef4fe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,10 @@
 .deps
 .dirstamp
 .gdb-history
+/ABOUT-NLS
 /GNUmakefile
 /INSTALL
+/README-release
 /aclocal.m4
 /config.cache
 /config.log
diff --git a/README-release b/README-release
deleted file mode 100644
index e5e14e9..0000000
--- a/README-release
+++ /dev/null
@@ -1,83 +0,0 @@
-Here are most of the steps we (maintainers) follow when making a release.
-
-* start from a clean, up-to-date git directory.
-
-    git checkout master; git pull
-
-* Run ./configure && make maintainer-clean
-
-* Ensure that the desired versions of autoconf, automake, etc.
-  are in your PATH.  See the buildreq list in bootstrap.conf for
-  the complete list.
-
-* Ensure that you're on "master" with no uncommitted diffs.
-  This should produce no output: git checkout master; git diff
-
-* Run bootstrap one last time.  This downloads any new translations:
-
-    ./bootstrap
-
-* Pre-release testing:
-  Ensure that make check syntax-check succeeds.
-
-* Run "make distcheck"
-
-* Set the date, version number, and release type [stable/alpha/beta] on
-  line 3 of NEWS, commit that, and tag the release by running e.g.,
-
-    build-aux/do-release-commit-and-tag X.Y stable
-
-* Run the following to create release tarballs.  Your choice selects the
-  corresponding upload-to destination in the emitted gnupload command.
-  The different destinations are specified in cfg.mk.  See the definitions
-  of gnu_ftp_host-{alpha,beta,stable}.
-
-    # "TYPE" must be stable, beta or alpha
-    make TYPE
-
-* Test the tarball.  copy it to a few odd-ball systems and ensure that
-  it builds and passes all tests.
-
-* While that's happening, write the release announcement that you will
-  soon post.
-
-Once all the builds and tests have passed,
-
-* Run the gnupload command that was suggested by your "make stable" run above.
-
-* Wait a few minutes (maybe up to 30?) and then use the release URLs to
-  download all tarball/signature pairs and use gpg --verify to ensure
-  that they're all valid.
-
-* Push the NEWS-updating changes and the new tag:
-
-    v=$(cat .prev-version)
-    git push origin master tag v$v
-
-* Announce it on Savannah first, so you can include the preferable
-  savannah.org announcement link in the email message.
-
-  From here:
-    https://savannah.gnu.org/projects/diffutils/
-  click on the "submit news", then write something like the following:
-  (If there is no such button, then enable "News" for the project via
-   the Main -> "Select Features" menu item, or via this link:
-   https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=diffutils)
-
-    Subject: diffutils-X.Y released [stable]
-    +verbatim+
-    ...paste the announcement here...
-    -verbatim-
-
-  Then go here to approve it:
-    https://savannah.gnu.org/news/approve.php?group=diffutils
-
-* Send the announcement email message.
-
-* After each non-alpha release, update the on-line manual accessible via
-
-    http://www.gnu.org/software/diffutils/manual/
-
-  by running this:
-
-    build-aux/gnu-web-doc-update
diff --git a/bootstrap.conf b/bootstrap.conf
index e00ff2b..7dd289a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -53,6 +53,7 @@ mkstemp
 mktime
 progname
 propername
+readme-release
 regex
 sh-quote
 signal
@@ -141,4 +142,5 @@ bootstrap_epilogue()
   m=gnulib-tests/gnulib.mk
   sed 's,\.\./\.\.,..,g' $m > $m-t
   mv -f $m-t $m
+  perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
 }
-- 
1.7.5.1.341.g177b8



From MAILER-DAEMON Wed May 18 14:48:43 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QMlnX-0000Y2-94
	for mharc-bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:43 -0400
Received: from eggs.gnu.org ([140.186.70.92]:49423)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnV-0000Vs-EJ
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnT-0006CQ-Ew
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:41 -0400
Received: from mx.meyering.net ([82.230.74.64]:35121)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@mx.meyering.net>) id 1QMlnT-0006Bx-3X
	for bug-diffutils@gnu.org; Wed, 18 May 2011 14:48:39 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 4B83F6034A; Wed, 18 May 2011 20:48:38 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Wed, 18 May 2011 20:48:33 +0200
Message-Id: <1305744515-12723-3-git-send-email-jim@meyering.net>
X-Mailer: git-send-email 1.7.5.1
In-Reply-To: <1305744515-12723-1-git-send-email-jim@meyering.net>
References: <1305744515-12723-1-git-send-email-jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 82.230.74.64
Subject: [bug-diffutils] [PATCH 2/4] maint: prepare for the tight-scope check
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 May 2011 18:48:42 -0000

From: Jim Meyering <meyering@redhat.com>

* src/diff.h: Mark function declarations with "extern" in
preparation for the tight-scope check.
(ignore_white_space): Separate enum decl from declaration
of this variable.
* src/Makefile.am (diff_SOURCES): Move diff.h from here to ...
(noinst_HEADERS): ...here.
For convenience, since the tight-scope rule uses $(noinst_HEADERS).
---
 src/Makefile.am |    5 +--
 src/diff.h      |   79 ++++++++++++++++++++++++++++++-------------------------
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 43ec9be..e94879c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,6 @@

 bin_PROGRAMS = cmp diff diff3 sdiff

-noinst_HEADERS = system.h
-
 localedir = $(datadir)/locale

 AM_CPPFLAGS = -I../lib -I$(top_srcdir)/lib
@@ -41,8 +39,9 @@ cmp_SOURCES = cmp.c
 diff3_SOURCES = diff3.c
 sdiff_SOURCES = sdiff.c
 diff_SOURCES = \
-  analyze.c context.c diff.c diff.h dir.c ed.c ifdef.c io.c \
+  analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \
   normal.c side.c util.c
+noinst_HEADERS = diff.h system.h

 MOSTLYCLEANFILES = paths.h paths.ht

diff --git a/src/diff.h b/src/diff.h
index 9fea7c0..88332a5 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -98,7 +98,7 @@ XTERN bool text;
 XTERN lin horizon_lines;

 /* The significance of white space during comparisons.  */
-XTERN enum
+enum DIFF_white_space
 {
   /* All white space is significant (the default).  */
   IGNORE_NO_WHITE_SPACE,
@@ -111,7 +111,8 @@ XTERN enum

   /* Ignore all horizontal white space (-w).  */
   IGNORE_ALL_SPACE
-} ignore_white_space;
+};
+XTERN enum DIFF_white_space ignore_white_space;

 /* Ignore changes that affect only blank lines (-B).  */
 XTERN bool ignore_blank_lines;
@@ -316,57 +317,63 @@ XTERN FILE *outfile;
 /* Declare various functions.  */

 /* analyze.c */
-int diff_2_files (struct comparison *);
+extern int diff_2_files (struct comparison *);

 /* context.c */
-void print_context_header (struct file_data[], bool);
-void print_context_script (struct change *, bool);
+extern void print_context_header (struct file_data[], bool);
+extern void print_context_script (struct change *, bool);

 /* dir.c */
-int diff_dirs (struct comparison const *, int (*) (struct comparison const *, char const *, char const *));
+extern int diff_dirs (struct comparison const *,
+                      int (*) (struct comparison const *,
+                               char const *, char const *));

 /* ed.c */
-void print_ed_script (struct change *);
-void pr_forward_ed_script (struct change *);
+extern void print_ed_script (struct change *);
+extern void pr_forward_ed_script (struct change *);

 /* ifdef.c */
-void print_ifdef_script (struct change *);
+extern void print_ifdef_script (struct change *);

 /* io.c */
-void file_block_read (struct file_data *, size_t);
-bool read_files (struct file_data[], bool);
+extern void file_block_read (struct file_data *, size_t);
+extern bool read_files (struct file_data[], bool);

 /* normal.c */
-void print_normal_script (struct change *);
+extern void print_normal_script (struct change *);

 /* rcs.c */
-void print_rcs_script (struct change *);
+extern void print_rcs_script (struct change *);

 /* side.c */
-void print_sdiff_script (struct change *);
+extern void print_sdiff_script (struct change *);

 /* util.c */
 extern char const change_letter[4];
 extern char const pr_program[];
-char *concat (char const *, char const *, char const *);
-bool lines_differ (char const *, char const *);
-lin translate_line_number (struct file_data const *, lin);
-struct change *find_change (struct change *);
-struct change *find_reverse_change (struct change *);
-void *zalloc (size_t);
-enum changes analyze_hunk (struct change *, lin *, lin *, lin *, lin *);
-void begin_output (void);
-void debug_script (struct change *);
-void fatal (char const *) __attribute__((noreturn));
-void finish_output (void);
-void message (char const *, char const *, char const *);
-void message5 (char const *, char const *, char const *, char const *, char const *);
-void output_1_line (char const *, char const *, char const *, char const *);
-void perror_with_name (char const *);
-void pfatal_with_name (char const *) __attribute__((noreturn));
-void print_1_line (char const *, char const * const *);
-void print_message_queue (void);
-void print_number_range (char, struct file_data *, lin, lin);
-void print_script (struct change *, struct change * (*) (struct change *), void (*) (struct change *));
-void setup_output (char const *, char const *, bool);
-void translate_range (struct file_data const *, lin, lin, long int *, long int *);
+extern char *concat (char const *, char const *, char const *);
+extern bool lines_differ (char const *, char const *);
+extern lin translate_line_number (struct file_data const *, lin);
+extern struct change *find_change (struct change *);
+extern struct change *find_reverse_change (struct change *);
+extern void *zalloc (size_t);
+extern enum changes analyze_hunk (struct change *, lin *, lin *, lin *, lin *);
+extern void begin_output (void);
+extern void debug_script (struct change *);
+extern void fatal (char const *) __attribute__((noreturn));
+extern void finish_output (void);
+extern void message (char const *, char const *, char const *);
+extern void message5 (char const *, char const *, char const *,
+                      char const *, char const *);
+extern void output_1_line (char const *, char const *, char const *,
+                           char const *);
+extern void perror_with_name (char const *);
+extern void pfatal_with_name (char const *) __attribute__((noreturn));
+extern void print_1_line (char const *, char const * const *);
+extern void print_message_queue (void);
+extern void print_number_range (char, struct file_data *, lin, lin);
+extern void print_script (struct change *, struct change * (*) (struct change *),
+                          void (*) (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 *);
-- 
1.7.5.1.341.g177b8



From MAILER-DAEMON Mon May 23 13:34:05 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QOZ13-0003kX-24
	for mharc-bug-diffutils@gnu.org; Mon, 23 May 2011 13:34:05 -0400
Received: from eggs.gnu.org ([140.186.70.92]:59711)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QOZ11-0003k4-3S
	for bug-diffutils@gnu.org; Mon, 23 May 2011 13:34:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QOZ0y-0001gY-UV
	for bug-diffutils@gnu.org; Mon, 23 May 2011 13:34:03 -0400
Received: from mx.meyering.net ([82.230.74.64]:40896)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QOZ0y-0001gJ-Jd
	for bug-diffutils@gnu.org; Mon, 23 May 2011 13:34:00 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id B3029600CB; Mon, 23 May 2011 19:33:59 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Mon, 23 May 2011 19:33:59 +0200
Message-ID: <87d3j9mid4.fsf@rho.meyering.net>
Lines: 139
MIME-Version: 1.0
Content-Type: text/plain
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 82.230.74.64
Subject: [bug-diffutils] [PATCH] maint: update README-hacking
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 May 2011 17:34:04 -0000

Karl noticed that diffutils' README-hacking was
so woefully out of date that it still mentioned cvs,
and he even sent this patch to fix everything:

>From 0b7299f98e9ce4e10cc595414e1505f239022e36 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@gnu.org>
Date: Mon, 23 May 2011 09:41:48 -0700
Subject: [PATCH] maint: update README-hacking

* README-hacking: Update a la coreutils for git, etc.
---
 README-hacking |   88 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/README-hacking b/README-hacking
index 2e58626..b195764 100644
--- a/README-hacking
+++ b/README-hacking
@@ -2,52 +2,96 @@

 These notes intend to help people working on the checked-out sources.
 These requirements do not apply when building from a distribution tarball.
+See also HACKING for more detailed contribution guidelines.

 * Requirements

 We've opted to keep only the highest-level sources in the GIT repository.
 This eases our maintenance burden, (fewer merges etc.), but imposes more
 requirements on anyone wishing to build from the just-checked-out sources.
-For example, you have to use the latest stable versions of the maintainer
-tools we depend upon, including:
-
-- Automake <http://www.gnu.org/software/automake/>
-- Autoconf <http://www.gnu.org/software/autoconf/>
-- Gettext <http://www.gnu.org/software/gettext/>
-- Gzip <http://www.gnu.org/software/gzip/>
-- M4 <http://www.gnu.org/software/m4/>
-- Tar <http://www.gnu.org/software/tar/>
-- Wget <http://www.gnu.org/software/wget/>
+Note the requirements to build the released archive are much less and
+are just the requirements of the standard ./configure && make procedure.
+Specific development tools and versions will be checked for and listed by
+the bootstrap script.  See README-prereq for specific notes on obtaining
+these prerequisite tools.

 Valgrind <http://valgrind.org/> is also highly recommended, if
 Valgrind supports your architecture.

-Only building the initial full source tree will be a bit painful.
-Later, a plain `cvs update -dP && make' should be sufficient.
+While building from a just-cloned source tree may require installing a
+few prerequisites, later, a plain `git pull && make' should be sufficient.
+
+* First GIT checkout
+
+You can get a copy of the source repository like this:
+
+        $ git clone git://git.sv.gnu.org/diffutils
+        $ cd diffutils

-* First checkout
+As an optional step, if you already have a copy of the gnulib git
+repository on your hard drive, then you can use it as a reference to
+reduce download time and disk space requirements:

-Obviously, if you are reading these notes, you did manage to check out
-this package from CVS.  The next step is to get other files needed to
-build, which are extracted from other source packages:
+        $ export GNULIB_SRCDIR=/path/to/gnulib

-	$ ./bootstrap
+The next step is to get and check other files needed to build,
+which are extracted from other source packages:
+
+        $ ./bootstrap
+
+To use the most-recent gnulib (as opposed to the gnulib version that
+the package last synchronized to), do this next:
+
+        $ git submodule foreach git pull origin master
+        $ git commit -m 'build: update gnulib submodule to latest' gnulib

 And there you are!  Just

-	$ ./configure
-	$ make
-	$ make check
+        $ ./configure --quiet #[--enable-gcc-warnings] [*]
+        $ make
+        $ make check

 At this point, there should be no difference between your local copy,
-and the master:
+and the GIT master copy:

-	$ cvs diff -pu
+        $ git diff

 should output no difference.

 Enjoy!

+[*] The --enable-gcc-warnings option is useful only with glibc
+and with a very recent version of gcc.  You'll probably also have
+to use recent system headers.  If you configure with this option,
+and spot a problem, please be sure to send the report to the bug
+reporting address of this package, and not to that of gnulib, even
+if the problem seems to originate in a gnulib-provided file.
+
+* Submitting patches
+
+If you develop a fix or a new feature, please send it to the
+appropriate bug-reporting address as reported by the --help option of
+each program.  One way to do this is to use vc-dwim
+<http://www.gnu.org/software/vc-dwim/>), as follows.
+
+  Run the command "vc-dwim --help", copy its definition of the
+  "git-changelog-symlink-init" function into your shell, and then run
+  this function at the top-level directory of the package.
+
+  Edit the (empty) ChangeLog file that this command creates, creating a
+  properly-formatted entry according to the GNU coding standards
+  <http://www.gnu.org/prep/standards/html_node/Change-Logs.html>.
+
+  Make your changes.
+
+  Run the command "vc-dwim" and make sure its output (the diff of all
+  your changes) looks good.
+
+  Run "vc-dwim --commit".
+
+  Run the command "git format-patch --stdout -1", and email its output
+  in, using the output's subject line.
+
 -----

 Copyright (C) 2002-2007, 2009-2011 Free Software Foundation, Inc.
--
1.7.5.2.1.g56b30


From MAILER-DAEMON Mon May 23 13:35:26 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QOZ2M-0004Uf-1X
	for mharc-bug-diffutils@gnu.org; Mon, 23 May 2011 13:35:26 -0400
Received: from eggs.gnu.org ([140.186.70.92]:59897)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QOZ2J-0004UR-UG
	for bug-diffutils@gnu.org; Mon, 23 May 2011 13:35:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QOZ2F-0001s2-Qw
	for bug-diffutils@gnu.org; Mon, 23 May 2011 13:35:23 -0400
Received: from mx.meyering.net ([82.230.74.64]:47864)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QOZ2F-0001ro-JE
	for bug-diffutils@gnu.org; Mon, 23 May 2011 13:35:19 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id DD1BD60160; Mon, 23 May 2011 19:35:18 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Mon, 23 May 2011 19:35:18 +0200
Message-ID: <877h9hmiax.fsf@rho.meyering.net>
Lines: 48
MIME-Version: 1.0
Content-Type: text/plain
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 82.230.74.64
Subject: [bug-diffutils] [PATCH 1/2] maint: update gnulib to latest with
	accompanying tight-scope tweaks
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 May 2011 17:35:24 -0000

Now that gnulib's rule no longer includes "XTERN",
we configure it to do so here:

>From 91d850a78b100bf78c9f77abf38c0369b877f597 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 23 May 2011 19:20:05 +0200
Subject: [PATCH 1/2] maint: update gnulib to latest with accompanying
 tight-scope tweaks

* cfg.mk: Include $(srcdir)/dist-check.mk using "-include",
to accommodate the new sc_tight_scope rule.
(_gl_TS_extern): Define, to tell gnulib's tight_scope rule that
headers here mark externs with "XTERN".
* gnulib: Update to latest.
---
 cfg.mk |    5 ++++-
 gnulib |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 45f52e0..5f0d836 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -39,7 +39,7 @@ update-copyright-env = \
   UPDATE_COPYRIGHT_USE_INTERVALS=1 \
   UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79

-include $(srcdir)/dist-check.mk
+-include $(srcdir)/dist-check.mk

 gendocs_options_ = -s $(srcdir)/diff.texi

@@ -66,3 +66,6 @@ config-save:
 	cp lib/config.h config.status $(_cf_state_dir)/latest

 exclude_file_name_regexp--sc_space_tab = ^gl/lib/.*\.c\.diff$$
+
+# Tell gnulib's tight_scope rule that we mark externs with XTERN
+export _gl_TS_extern = extern|XTERN
diff --git a/gnulib b/gnulib
index 2c25c9e..483bd08 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 2c25c9ebe8db1415bfde25f0a451767332c8cf59
+Subproject commit 483bd08221cccf613ae5bb5738076113150579b0
--
1.7.5.2.1.g56b30


From MAILER-DAEMON Fri May 27 18:23:27 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QQ5RH-0006X0-MF
	for mharc-bug-diffutils@gnu.org; Fri, 27 May 2011 18:23:27 -0400
Received: from eggs.gnu.org ([140.186.70.92]:49887)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <calestyo@scientia.net>) id 1QQ5RF-0006Ws-BF
	for bug-diffutils@gnu.org; Fri, 27 May 2011 18:23:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <calestyo@scientia.net>) id 1QQ5RD-0006cA-2q
	for bug-diffutils@gnu.org; Fri, 27 May 2011 18:23:25 -0400
Received: from mailgw02.dd24.net ([193.46.215.43]:40048)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <calestyo@scientia.net>) id 1QQ5RC-0006bl-Oj
	for bug-diffutils@gnu.org; Fri, 27 May 2011 18:23:23 -0400
Received: from localhost (amavis02.dd24.net [192.168.1.113])
	by mailgw02.dd24.net (Postfix) with ESMTP id 9BF2F354CB0;
	Fri, 27 May 2011 22:23:20 +0000 (GMT)
X-Virus-Scanned: domaindiscount24.com mail filter gateway
Received: from mailgw02.dd24.net ([192.168.1.197])
	by localhost (amavis02.dd24.net [192.168.1.106]) (amavisd-new,
	port 10197)
	with ESMTP id uAxX2KrDya81; Fri, 27 May 2011 22:23:15 +0000 (GMT)
Received: from [192.168.0.101] (ppp-93-104-100-172.dynamic.mnet-online.de
	[93.104.100.172])
	by mailgw02.dd24.net (Postfix) with ESMTPA id A0AC435540E;
	Fri, 27 May 2011 22:23:15 +0000 (GMT)
From: Christoph Anton Mitterer <calestyo@scientia.net>
To: Paul Eggert <eggert@CS.UCLA.EDU>
In-Reply-To: <4C649A8C.8060905@cs.ucla.edu>
References: <10d13d6fb4036cc51d36b387775aad74@imap.dd24.net>
	<4C649A8C.8060905@cs.ucla.edu>
Content-Type: multipart/signed; micalg="sha1";
	protocol="application/x-pkcs7-signature";
	boundary="=-26hinaPaKCyv55wT0U4K"
Date: Sat, 28 May 2011 00:23:14 +0200
Message-ID: <1306534994.3190.7.camel@fermat.scientia.net>
Mime-Version: 1.0
X-Mailer: Evolution 2.32.3 
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 193.46.215.43
Cc: bug-diffutils@gnu.org
Subject: Re: [bug-diffutils] bug: diff -r swaps the files it should check
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 May 2011 22:23:26 -0000


--=-26hinaPaKCyv55wT0U4K
Content-Type: multipart/mixed; boundary="=-jRZ78xgMaR4VdyLOJ8C/"


--=-jRZ78xgMaR4VdyLOJ8C/
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi Paul.

I've seen this issue again now using diff 3.0 from Debian sid (see the
attached log file output.


Any ideas?

Cheers,
Chris.

On Fri, 2010-08-13 at 03:06 +0200, Paul Eggert wrote:
> On 08/07/10 18:50, Christoph Anton Mitterer wrote:
>=20
> > I found a rather strange bug in diff (Debian version 1:3.0-1) when doin=
g
> > large backups of millions of files.
> > First I've copied the data to an external HDD, then I've did an "diff -=
q
> > -r >out 2> err" in order to find any errors.
>=20
> A wise precaution!  I do that sort of thing a lot.
>=20
> > The strange unicode characters had their character codes inside which r=
ead
> > as follows:
> > 1CEE      1CAE
> > 1CAE      1CEE
> > ...
> > Any ideas?
>=20
> My idea is that you've found and reported a bug that has been in GNU
> diff ever since 2.8 was released back in 2002.  Thanks very much for
> reporting this: you've undoubtedly saved others some work and
> hair-pulling.
>=20
> I've installed the following patch, which I hope fixes things.  If you
> can test it on your data, that'd be nice.  I have verified this bug on
> a much simpler test case, and this patch includes the test case to try
> to make sure that a similar bug doesn't creep back in later.
>=20
>=20
>=20
> >From 29ac7f191c444400c6df067647e3158a1e188ddf Mon Sep 17 00:00:00 2001
> From: Paul Eggert <eggert@cs.ucla.edu>
> Date: Thu, 12 Aug 2010 17:55:05 -0700
> Subject: [PATCH] diff: avoid spurious diffs when two distinct dir entries=
 compare equal
>=20
> Problem reported by Christoph Anton Mitterer in:
> http://lists.gnu.org/archive/html/bug-diffutils/2010-08/msg00000.html
>=20
> * NEWS: Mention this bug fix.
> * src/dir.c (compare_names_for_qsort): Fall back on file_name_cmp
> if two distinct entries in the same directory compare equal.
> (diff_dirs): Prefer a file_name_cmp match when available.
> * tests/Makefile.am (TESTS): New test colliding-file-names.
> * tests/colliding-file-names: New file.
> ---
>  NEWS                       |    5 +++++
>  src/dir.c                  |   41 ++++++++++++++++++++++++++++++++++++++=
+--
>  tests/Makefile.am          |    1 +
>  tests/colliding-file-names |   20 ++++++++++++++++++++
>  4 files changed, 65 insertions(+), 2 deletions(-)
>  create mode 100644 tests/colliding-file-names
>=20
> diff --git a/NEWS b/NEWS
> index 27b9886..1c41e9e 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -2,6 +2,11 @@ GNU diffutils NEWS                                    -*=
- outline -*-
> =20
>  * Noteworthy changes in release ?.? (????-??-??) [?]
> =20
> +** Bug fixes
> +
> +  diff no longer reports spurious differences merely because two entries
> +  in the same directory have names that compare equal in the current
> +  locale, or compare equal because --ignore-file-name-case was given.
> =20
>  * Noteworthy changes in release 3.0 (2010-05-03) [stable]
> =20
> diff --git a/src/dir.c b/src/dir.c
> index 5b4eaec..1b078ab 100644
> --- a/src/dir.c
> +++ b/src/dir.c
> @@ -166,14 +166,16 @@ compare_names (char const *name1, char const *name2=
)
>  	  : file_name_cmp (name1, name2));
>  }
> =20
> -/* A wrapper for compare_names suitable as an argument for qsort.  */
> +/* Compare names FILE1 and FILE2 when sorting a directory.
> +   Prefer filtered comparison, breaking ties with file_name_cmp.  */
> =20
>  static int
>  compare_names_for_qsort (void const *file1, void const *file2)
>  {
>    char const *const *f1 =3D file1;
>    char const *const *f2 =3D file2;
> -  return compare_names (*f1, *f2);
> +  int diff =3D compare_names (*f1, *f2);
> +  return diff ? diff : file_name_cmp (*f1, *f2);
>  }
>  =0C
>  /* Compare the contents of two directories named in CMP.
> @@ -253,6 +255,41 @@ diff_dirs (struct comparison const *cmp,
>  	     pretend the "next name" in that dir is very large.  */
>  	  int nameorder =3D (!*names[0] ? 1 : !*names[1] ? -1
>  			   : compare_names (*names[0], *names[1]));
> +
> +	  /* Prefer a file_name_cmp match if available.  This algorithm is
> +	     O(N**2), where N is the number of names in a directory
> +	     that compare_names says are all equal, but in practice N
> +	     is so small it's not worth tuning.  */
> +	  if (nameorder =3D=3D 0)
> +	    {
> +	      int raw_order =3D file_name_cmp (*names[0], *names[1]);
> +	      if (raw_order !=3D 0)
> +		{
> +		  int greater_side =3D raw_order < 0;
> +		  int lesser_side =3D 1 - greater_side;
> +		  char const **lesser =3D names[lesser_side];
> +		  char const *greater_name =3D *names[greater_side];
> +		  char const **p;
> +
> +		  for (p =3D lesser + 1;
> +		       *p && compare_names (*p, greater_name) =3D=3D 0;
> +		       p++)
> +		    {
> +		      int cmp =3D file_name_cmp (*p, greater_name);
> +		      if (0 <=3D cmp)
> +			{
> +			  if (cmp =3D=3D 0)
> +			    {
> +			      memmove (lesser + 1, lesser,
> +				       (char *) p - (char *) lesser);
> +			      *lesser =3D greater_name;
> +			    }
> +			  break;
> +			}
> +		    }
> +		}
> +	    }
> +
>  	  int v1 =3D (*handle_file) (cmp,
>  				   0 < nameorder ? 0 : *names[0]++,
>  				   nameorder < 0 ? 0 : *names[1]++);
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 6a4858c..242d501 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -1,6 +1,7 @@
>  TESTS =3D \
>    basic \
>    binary \
> +  colliding-file-names \
>    help-version	\
>    function-line-vs-leading-space \
>    label-vs-func	\
> diff --git a/tests/colliding-file-names b/tests/colliding-file-names
> new file mode 100644
> index 0000000..f14dce7
> --- /dev/null
> +++ b/tests/colliding-file-names
> @@ -0,0 +1,20 @@
> +#!/bin/sh
> +# Check that diff responds well if a directory has multiple file names
> +# that compare equal.
> +
> +: ${srcdir=3D.}
> +. "$srcdir/init.sh"; path_prepend_ ../src
> +
> +mkdir d1 d2 || fail=3D1
> +
> +for i in abc abC aBc aBC Abc AbC ABc ABC; do
> + echo $i >d1/$i || fail=3D1
> +done
> +
> +for i in ABC ABc AbC Abc aBC aBc abC abc; do
> + echo $i >d2/$i || fail=3D1
> +done
> +
> +diff -r --ignore-file-name-case d1 d2 || fail=3D1
> +
> +Exit $fail


--=-jRZ78xgMaR4VdyLOJ8C/
Content-Disposition: attachment; filename="log"
Content-Transfer-Encoding: base64
Content-Type: text/plain; name="log"; charset="UTF-8"

RmlsZXMgMS9mb28vYmFyL2Jhei9maWxl4bOuanBlZyBhbmQgMi9mb28vYmFyL2Jhei9maWxl4bKu
anBlZyBkaWZmZXINCkZpbGVzIDEvZm9vL2Jhci9iYXovZmlsZeGyrmpwZWcgYW5kIDIvZm9vL2Jh
ci9iYXovZmlsZeGzrmpwZWcgZGlmZmVyDQo=


--=-jRZ78xgMaR4VdyLOJ8C/--

--=-26hinaPaKCyv55wT0U4K
Content-Type: application/x-pkcs7-signature; name="smime.p7s"
Content-Disposition: attachment; filename="smime.p7s"
Content-Transfer-Encoding: base64

MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIITMjCCBggw
ggPwoAMCAQICAQEwDQYJKoZIhvcNAQEEBQAweTEQMA4GA1UEChMHUm9vdCBDQTEeMBwGA1UECxMV
aHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0IFNpZ25pbmcgQXV0aG9yaXR5
MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2VydC5vcmcwHhcNMDUxMDE0MDczNjU1WhcNMzMw
MzI4MDczNjU1WjBUMRQwEgYDVQQKEwtDQWNlcnQgSW5jLjEeMBwGA1UECxMVaHR0cDovL3d3dy5D
QWNlcnQub3JnMRwwGgYDVQQDExNDQWNlcnQgQ2xhc3MgMyBSb290MIICIjANBgkqhkiG9w0BAQEF
AAOCAg8AMIICCgKCAgEAq0k1EUh80iZ+U5TPQ6ndKNdCKovzh3gZWHwPntqJfeH763KQDXShlmSr
n6AkmXPa4lV2xxd79QSsRrjDvn9kjRBsJPNhnMDykPpR5vVpAWPDD1biSkLP4kSMJSioxXkJfUa5
ivPp8zQpCEXkHJ/LlAQcgagUs5hlxEPsToKNCdG9qluNktDs3pDFfwrC4+vmMVpedD6XM1nowwM9
YDO/99FvR8TN7mKDUm4uCJqk2RUYkaaFkkewrkjrbbch7IUaaHI1q//wEF3A9JSnatU7kn5MkAV+
k8Esi6SOYnQVcW4LcQPqrxU4mtTSBXJvjPkr61pyJfk5RuNyGz4Ew2QnIhAqik9YpwOtvrQuE+1d
qkjX1X3UKntc+kYEUOTMDkJbjO3b8s/8lpPg2xE2VGI0OI8MYJs7l1Y4rfPSW4ugW+pOlrh819Wg
hnBA05Ept6I8rfWMu88akorkNHvA2Gxf6QrCw6cgmlrfLF1SXLpH1ZvvJChwOCAv1X8pwLJBA2iS
zOCczJdLRe86EAqrcDqYlXCtNbHqhSukHIAhMamuYHqAJkgAuAHAk2NVIpE8Vuev2zol848xVOom
i4FZ+aHRUxHFe50D9nQR4G2xLD8shpGZcZqmd4s0YNEUtCysna+MENOfxGr4bxP8c1n3ZkJ0Horj
+NzSb5icy0eYlUAF++kCAwEAAaOBvzCBvDAPBgNVHRMBAf8EBTADAQH/MF0GCCsGAQUFBwEBBFEw
TzAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuQ0FjZXJ0Lm9yZy8wKAYIKwYBBQUHMAKGHGh0dHA6
Ly93d3cuQ0FjZXJ0Lm9yZy9jYS5jcnQwSgYDVR0gBEMwQTA/BggrBgEEAYGQSjAzMDEGCCsGAQUF
BwIBFiVodHRwOi8vd3d3LkNBY2VydC5vcmcvaW5kZXgucGhwP2lkPTEwMA0GCSqGSIb3DQEBBAUA
A4ICAQB/CIih2hpQSdqJ+6EIcvOK9x7EOrR5WyAwsUXewl3TZWnxwl1UVDyFX7l7QpHCmf0bUZur
RqWhEFOebYisc24sM6bw9J7gdcE+iEWp4WZD/lZa0XpBePdA2ko68QtbpbsWBubC55O5hU2XT7Ee
OEOA75sNjO+4p2AAh1d9HkQcyyPvmzyZna+1KRxFeRaWTSdt8Rxsw8JVZLO8FOLzpB8eMvwnFQXP
3S6uPoJhe/AhEBj2ROpTOfnc0Jog4Ma74LtaT8SZyAe9tb2i2y5iDUI0Qbz/i4r1USKqiDAA4rDU
vL5lutUDV3mb6NzITfhQ7ZGlUiiirPs2WD7plCuRUIcb1l7WjMz3DxAMUk7QFmHl5QpsvxfHckZX
nJj1bGBjem9euU4vyLm5u2qFvJgN7fk+l4Q0lK4Ar6Hl55JuTr3z4tkUi1zS6wFsoBelLRDrnHpK
vb3uzv3tIkCrcDiI9QqHasKrBWDJSAXaU8HeRHdqs/M8PO2AvKY4SikkX/5ZO5slelZjAGS5XaRi
fVc2T62D7x+SU6COd1fd5WERPSMAkEw8+qNgkwSjrzX2DmqPT0pgp4UFbEahj/THduOhWVf3cbLE
bhRcbW1BZt8bk7HUAMPuy888PSGAqV9jZfzd4F+k9CvwhXFB1Gcl+xqxl67WmYITQdJupRuZJ4Dn
C6moADCCBo8wggR3oAMCAQICAwCyHTANBgkqhkiG9w0BAQUFADBUMRQwEgYDVQQKEwtDQWNlcnQg
SW5jLjEeMBwGA1UECxMVaHR0cDovL3d3dy5DQWNlcnQub3JnMRwwGgYDVQQDExNDQWNlcnQgQ2xh
c3MgMyBSb290MB4XDTEwMDgwMTIxMjc0M1oXDTEyMDczMTIxMjc0M1owggEdMSEwHwYDVQQDExhD
aHJpc3RvcGggQW50b24gTWl0dGVyZXIxJDAiBgkqhkiG9w0BCQEWFWNhbGVzdHlvQHNjaWVudGlh
Lm5ldDExMC8GCSqGSIb3DQEJARYibWFpbEBjaHJpc3RvcGguYW50b24ubWl0dGVyZXIubmFtZTEv
MC0GCSqGSIb3DQEJARYgY2hyaXN0b3BoLmFudG9uLm1pdHRlcmVyQGNlcm4uY2gxPjA8BgkqhkiG
9w0BCQEWL2NocmlzdG9waC5hbnRvbi5taXR0ZXJlckBwaHlzaWsudW5pLW11ZW5jaGVuLmRlMS4w
LAYJKoZIhvcNAQkBFh9jaHJpc3RvcGguYW50b24ubWl0dGVyZXJAbG11LmRlMIIBIjANBgkqhkiG
9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwNa6CEzsTRd3bRYXPNn2KYKhFZbyPPk1CjuFfy+1PAfKBiG
JmhhHGkmwCdnOd5aVnGzwIPfTv/+Rw3Cuw2zJ4YmJmX3uNDz/l2M6h5MO7Bawv7CjdR+ljGaIBYi
gMuNaBawmoo60shkvOwf8df/Ou5KTxX7uL/hNOb1Q2/3yJWBBMPCbKD0nTvVH34nE1lfZxvKk/Mu
dT7jc/WZ3kJshsO7y0WS/DEDvqPiQI5zfCx/qslMYCSCwcqZ4/NHwEXX4zgt9tfPj34iBNLEod7H
zdNhCfdqn1j/FTsRI12M2OXEYhYgBoRNRYshPV10ePbV9+GPzvWlJm7Hn07fxVi4ZQIDAQABo4IB
nTCCAZkwDAYDVR0TAQH/BAIwADBWBglghkgBhvhCAQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRp
ZmljYXRlIGZvciBGUkVFIGhlYWQgb3ZlciB0byBodHRwOi8vd3d3LkNBY2VydC5vcmcwQAYDVR0l
BDkwNwYIKwYBBQUHAwQGCCsGAQUFBwMCBgorBgEEAYI3CgMEBgorBgEEAYI3CgMDBglghkgBhvhC
BAEwMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vb2NzcC5jYWNlcnQub3JnMIG6
BgNVHREEgbIwga+BFWNhbGVzdHlvQHNjaWVudGlhLm5ldIEibWFpbEBjaHJpc3RvcGguYW50b24u
bWl0dGVyZXIubmFtZYEgY2hyaXN0b3BoLmFudG9uLm1pdHRlcmVyQGNlcm4uY2iBL2NocmlzdG9w
aC5hbnRvbi5taXR0ZXJlckBwaHlzaWsudW5pLW11ZW5jaGVuLmRlgR9jaHJpc3RvcGguYW50b24u
bWl0dGVyZXJAbG11LmRlMA0GCSqGSIb3DQEBBQUAA4ICAQAQFRkG3/PZgFdEFzeQyB2Gy8aXvyfS
XpoF14+eAplacl6HXG874gfBw0VlTMkG7ynK3sh2cOEz20BMbly/MGT9tMpo246EhINlIwpfnqlS
GZ+AVXrmztX25Eler+fO2wOVEeCn+HV09wb95VJtdzeAVaWpON5cEjGm9TLpMfR3RDDDkkcKI1uB
kAcwVugRHmAXgx+2Mi6bDrG1q3TXA8JCdo+8ojdboSEpJvPXhXeKcN9N9ajLqcv/J0jp5s1jZCRn
oX8OGIu9KWYmD7w2dHaYDmi/JHAa1ddd38BjULi1azqAVr32f1UWzU12JucqGHvlsZvkr479f/jV
4G8ID7zz/KG0Qb1op7gOZnj56/ek2jHyFBlYnAsnqM2imqSkNZsOAhxLPsYvqE3APCTcFMSilCCD
66K8OLrzpAj6fzcY9UJ9pkRZBP+nkOTN9avqZivxwKR8Zvl4XG9NJEdftSDTjFaVeYjn8hiDW0c9
uqVlayI35d2L0jC6h/npeihVWSOBiqFd5sPepTrqe7AvPrpYR12QrbkYeqARcqYnLe3jKuyWyqhQ
EQty00Zb0n3d7ezZ15ECXBOQHhvlDkbT6UeGX3Xa9kvNYWIb62S1nZ4oicU94NPxwMYtttaOTjzY
3hb5/aS+TWT+xkTFSFmd2perZmiiyByCKC5bcp6cOPWgvzCCBo8wggR3oAMCAQICAwCyHTANBgkq
hkiG9w0BAQUFADBUMRQwEgYDVQQKEwtDQWNlcnQgSW5jLjEeMBwGA1UECxMVaHR0cDovL3d3dy5D
QWNlcnQub3JnMRwwGgYDVQQDExNDQWNlcnQgQ2xhc3MgMyBSb290MB4XDTEwMDgwMTIxMjc0M1oX
DTEyMDczMTIxMjc0M1owggEdMSEwHwYDVQQDExhDaHJpc3RvcGggQW50b24gTWl0dGVyZXIxJDAi
BgkqhkiG9w0BCQEWFWNhbGVzdHlvQHNjaWVudGlhLm5ldDExMC8GCSqGSIb3DQEJARYibWFpbEBj
aHJpc3RvcGguYW50b24ubWl0dGVyZXIubmFtZTEvMC0GCSqGSIb3DQEJARYgY2hyaXN0b3BoLmFu
dG9uLm1pdHRlcmVyQGNlcm4uY2gxPjA8BgkqhkiG9w0BCQEWL2NocmlzdG9waC5hbnRvbi5taXR0
ZXJlckBwaHlzaWsudW5pLW11ZW5jaGVuLmRlMS4wLAYJKoZIhvcNAQkBFh9jaHJpc3RvcGguYW50
b24ubWl0dGVyZXJAbG11LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwNa6CEz
sTRd3bRYXPNn2KYKhFZbyPPk1CjuFfy+1PAfKBiGJmhhHGkmwCdnOd5aVnGzwIPfTv/+Rw3Cuw2z
J4YmJmX3uNDz/l2M6h5MO7Bawv7CjdR+ljGaIBYigMuNaBawmoo60shkvOwf8df/Ou5KTxX7uL/h
NOb1Q2/3yJWBBMPCbKD0nTvVH34nE1lfZxvKk/MudT7jc/WZ3kJshsO7y0WS/DEDvqPiQI5zfCx/
qslMYCSCwcqZ4/NHwEXX4zgt9tfPj34iBNLEod7HzdNhCfdqn1j/FTsRI12M2OXEYhYgBoRNRYsh
PV10ePbV9+GPzvWlJm7Hn07fxVi4ZQIDAQABo4IBnTCCAZkwDAYDVR0TAQH/BAIwADBWBglghkgB
hvhCAQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQgb3ZlciB0
byBodHRwOi8vd3d3LkNBY2VydC5vcmcwQAYDVR0lBDkwNwYIKwYBBQUHAwQGCCsGAQUFBwMCBgor
BgEEAYI3CgMEBgorBgEEAYI3CgMDBglghkgBhvhCBAEwMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUF
BzABhhZodHRwOi8vb2NzcC5jYWNlcnQub3JnMIG6BgNVHREEgbIwga+BFWNhbGVzdHlvQHNjaWVu
dGlhLm5ldIEibWFpbEBjaHJpc3RvcGguYW50b24ubWl0dGVyZXIubmFtZYEgY2hyaXN0b3BoLmFu
dG9uLm1pdHRlcmVyQGNlcm4uY2iBL2NocmlzdG9waC5hbnRvbi5taXR0ZXJlckBwaHlzaWsudW5p
LW11ZW5jaGVuLmRlgR9jaHJpc3RvcGguYW50b24ubWl0dGVyZXJAbG11LmRlMA0GCSqGSIb3DQEB
BQUAA4ICAQAQFRkG3/PZgFdEFzeQyB2Gy8aXvyfSXpoF14+eAplacl6HXG874gfBw0VlTMkG7ynK
3sh2cOEz20BMbly/MGT9tMpo246EhINlIwpfnqlSGZ+AVXrmztX25Eler+fO2wOVEeCn+HV09wb9
5VJtdzeAVaWpON5cEjGm9TLpMfR3RDDDkkcKI1uBkAcwVugRHmAXgx+2Mi6bDrG1q3TXA8JCdo+8
ojdboSEpJvPXhXeKcN9N9ajLqcv/J0jp5s1jZCRnoX8OGIu9KWYmD7w2dHaYDmi/JHAa1ddd38Bj
ULi1azqAVr32f1UWzU12JucqGHvlsZvkr479f/jV4G8ID7zz/KG0Qb1op7gOZnj56/ek2jHyFBlY
nAsnqM2imqSkNZsOAhxLPsYvqE3APCTcFMSilCCD66K8OLrzpAj6fzcY9UJ9pkRZBP+nkOTN9avq
ZivxwKR8Zvl4XG9NJEdftSDTjFaVeYjn8hiDW0c9uqVlayI35d2L0jC6h/npeihVWSOBiqFd5sPe
pTrqe7AvPrpYR12QrbkYeqARcqYnLe3jKuyWyqhQEQty00Zb0n3d7ezZ15ECXBOQHhvlDkbT6UeG
X3Xa9kvNYWIb62S1nZ4oicU94NPxwMYtttaOTjzY3hb5/aS+TWT+xkTFSFmd2perZmiiyByCKC5b
cp6cOPWgvzGCAr0wggK5AgEBMFswVDEUMBIGA1UEChMLQ0FjZXJ0IEluYy4xHjAcBgNVBAsTFWh0
dHA6Ly93d3cuQ0FjZXJ0Lm9yZzEcMBoGA1UEAxMTQ0FjZXJ0IENsYXNzIDMgUm9vdAIDALIdMAkG
BSsOAwIaBQCgggE3MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEx
MDUyNzIyMjMxMlowIwYJKoZIhvcNAQkEMRYEFI9BOvTlYz67n1Ud4XaXZSa03bXPMGoGCSsGAQQB
gjcQBDFdMFswVDEUMBIGA1UEChMLQ0FjZXJ0IEluYy4xHjAcBgNVBAsTFWh0dHA6Ly93d3cuQ0Fj
ZXJ0Lm9yZzEcMBoGA1UEAxMTQ0FjZXJ0IENsYXNzIDMgUm9vdAIDALIdMGwGCyqGSIb3DQEJEAIL
MV2gWzBUMRQwEgYDVQQKEwtDQWNlcnQgSW5jLjEeMBwGA1UECxMVaHR0cDovL3d3dy5DQWNlcnQu
b3JnMRwwGgYDVQQDExNDQWNlcnQgQ2xhc3MgMyBSb290AgMAsh0wDQYJKoZIhvcNAQEBBQAEggEA
aOiBTddihfUOx6BMFiDp9bADxYVdgMBliXLtS07ouJBMDUs1gW6KavSrOIqXE4hFMet0LEoi6xhD
JpHZ5SCqPP+bCHhr5OjVKnYS5IzIG2/k9Va+SgOFEyKth8JcFlrkEonH0hVAx1t4g01Tm/m6J83J
/pJSqFjIZRgJC4H0TXGHUyajOiuP8GUl389qoNaKqgY9jwqTnYDNJuafru8vBH0O/wKuPKDY3eJc
SQuzyL2cZt6r8XLCui8s8g/vflgkRIczXD/L+/snKgnRSNKTZWrZ57D+kI05msOpBTDIHf6rJB5g
4PJ9rPP6RmSQdC1uIw3aswxOWQ/V3bvg8g5kOwAAAAAAAA==


--=-26hinaPaKCyv55wT0U4K--



From MAILER-DAEMON Sat May 28 00:24:19 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QQB4V-0000jK-Oy
	for mharc-bug-diffutils@gnu.org; Sat, 28 May 2011 00:24:19 -0400
Received: from eggs.gnu.org ([140.186.70.92]:58670)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1QQB4T-0000if-Uf
	for bug-diffutils@gnu.org; Sat, 28 May 2011 00:24:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1QQB4T-0000YS-6H
	for bug-diffutils@gnu.org; Sat, 28 May 2011 00:24:17 -0400
Received: from smtp.cs.ucla.edu ([131.179.128.62]:58672)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1QQB4S-0000YL-UU
	for bug-diffutils@gnu.org; Sat, 28 May 2011 00:24:17 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp.cs.ucla.edu (Postfix) with ESMTP id 6633E39E810A;
	Fri, 27 May 2011 21:24:16 -0700 (PDT)
X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu
Received: from smtp.cs.ucla.edu ([127.0.0.1])
	by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id G1uAB0rR5FU2; Fri, 27 May 2011 21:24:15 -0700 (PDT)
Received: from [192.168.1.10] (pool-71-189-109-235.lsanca.fios.verizon.net
	[71.189.109.235])
	by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 9B5E639E8100;
	Fri, 27 May 2011 21:24:15 -0700 (PDT)
Message-ID: <4DE078EE.4040909@cs.ucla.edu>
Date: Fri, 27 May 2011 21:24:14 -0700
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10
MIME-Version: 1.0
To: Christoph Anton Mitterer <calestyo@scientia.net>
References: <10d13d6fb4036cc51d36b387775aad74@imap.dd24.net>	
	<4C649A8C.8060905@cs.ucla.edu>
	<1306534994.3190.7.camel@fermat.scientia.net>
In-Reply-To: <1306534994.3190.7.camel@fermat.scientia.net>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 131.179.128.62
Cc: bug-diffutils@gnu.org
Subject: Re: [bug-diffutils] bug: diff -r swaps the files it should check
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 May 2011 04:24:18 -0000

On 05/27/11 15:23, Christoph Anton Mitterer wrote:

> I've seen this issue again now using diff 3.0 from Debian sid (see the
> attached log file output.

Is the problem reproducible?
Can you show how to reproduce the problem?

A quick look at the code did find one problem in this area,
though it may not be your problem.  Does the following patch fix
things for you?

--- a/src/dir.c
+++ b/src/dir.c
@@ -161,9 +161,7 @@ compare_names (char const *name1, char const *name2)
       return r;
     }
 
-  return (ignore_file_name_case
-	  ? strcasecmp (name1, name2)
-	  : file_name_cmp (name1, name2));
+  return file_name_cmp (name1, name2);
 }
 
 /* Compare names FILE1 and FILE2 when sorting a directory.


