From MAILER-DAEMON Sun May 13 09:18:33 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1STYgz-00015H-KF
	for mharc-bug-diffutils@gnu.org; Sun, 13 May 2012 09:18:33 -0400
Received: from eggs.gnu.org ([208.118.235.92]:42502)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefano.lattarini@gmail.com>) id 1STYgw-000159-ON
	for bug-diffutils@gnu.org; Sun, 13 May 2012 09:18:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefano.lattarini@gmail.com>) id 1STYgv-0002oW-2p
	for bug-diffutils@gnu.org; Sun, 13 May 2012 09:18:30 -0400
Received: from mail-wi0-f177.google.com ([209.85.212.177]:43817)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefano.lattarini@gmail.com>) id 1STYgu-0002oR-Q4
	for bug-diffutils@gnu.org; Sun, 13 May 2012 09:18:29 -0400
Received: by wibhm14 with SMTP id hm14so2137946wib.12
	for <bug-diffutils@gnu.org>; Sun, 13 May 2012 06:18:26 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=googlemail.com; s=20120113;
	h=from:to:cc:subject:date:message-id:x-mailer;
	bh=AjKeVJFHmGQFUrAAarSSvSsDFCc6LEQl1gVj7kcp9wA=;
	b=KmC4eJTNm8w6GAIFQsA7RjNUlb+ckKrjsJx0UBN8ABURo22PEf8+wWxaoxMpyv0Iht
	GwNPry9hV/qynnSpSrpRL2SzkZPpvzLjd/7Ma50qQ3gXGcUfl1wrsppcQTPXis7c9N8v
	A0/keWl5SnLEppfKzWEwW/aatrtQZ9PTQnJgmdrpQF8LKY/Dh0wXqvuC/QrbdrcjisFo
	pTML51dkFOG9uw/wg6zwPk1d4bIqoiMSqPb/Kv1/HX3umxzVNvGAGl8cuejmixZF4ZZC
	eZ8R2o+RO70y8eBFj6mLiW0ZcLz+i64NSVkttMnWbCMecHdalBXHhVBqLE6K9WHay+JT
	hDpw==
Received: by 10.216.212.234 with SMTP id y84mr1238010weo.81.1336915106869;
	Sun, 13 May 2012 06:18:26 -0700 (PDT)
Received: from localhost.localdomain
	(host160-103-dynamic.2-87-r.retail.telecomitalia.it. [87.2.103.160])
	by mx.google.com with ESMTPS id b3sm27375188wib.4.2012.05.13.06.18.25
	(version=TLSv1/SSLv3 cipher=OTHER);
	Sun, 13 May 2012 06:18:25 -0700 (PDT)
From: Stefano Lattarini <stefano.lattarini@gmail.com>
To: bug-diffutils@gnu.org
Date: Sun, 13 May 2012 15:18:15 +0200
Message-Id: <15e94d5be7a8e68cbd4872951573375b3d39b19c.1336914999.git.stefano.lattarini@gmail.com>
X-Mailer: git-send-email 1.7.9.5
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 209.85.212.177
Subject: [bug-diffutils] [PATCH] build: don't use 'AM_PROG_CC_STDC',
	is obsolete
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: Sun, 13 May 2012 13:18:32 -0000

The Automake-provided macro 'AM_PROG_CC_STDC' has been superseded by
the Autoconf-provided one 'AC_PROG_CC' since October 2002, and will
be removed in the next major automake version.  Stop using it.

* configure.ac (AM_PROG_CC_STDC): Drop it.

Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

 Found this while trying to bootstrap diffutils with the development
 version of automake (from master).

 Regards,
   Stefano

 configure.ac |    1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 199af3e..cf71ade 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,6 @@ AC_CONFIG_HEADER([lib/config.h:lib/config.hin])
 
 AC_PROG_AWK
 AC_PROG_CC
-AM_PROG_CC_STDC
 AM_MISSING_PROG([HELP2MAN], [help2man])
 AC_PROG_RANLIB
 gl_EARLY
-- 
1.7.9.5



From MAILER-DAEMON Sun May 13 22:47:30 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1STlJq-0001Kx-P2
	for mharc-bug-diffutils@gnu.org; Sun, 13 May 2012 22:47:30 -0400
Received: from eggs.gnu.org ([208.118.235.92]:37311)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1STlJo-0001Kk-EA
	for bug-diffutils@gnu.org; Sun, 13 May 2012 22:47:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1STlJm-0001mq-S6
	for bug-diffutils@gnu.org; Sun, 13 May 2012 22:47:27 -0400
Received: from smtp.cs.ucla.edu ([131.179.128.62]:43696)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1STlJm-0001mb-MP
	for bug-diffutils@gnu.org; Sun, 13 May 2012 22:47:26 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp.cs.ucla.edu (Postfix) with ESMTP id 8473939E800B;
	Sun, 13 May 2012 19:47:24 -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 z9mqaKlety08; Sun, 13 May 2012 19:47:24 -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 4092139E800A;
	Sun, 13 May 2012 19:47:24 -0700 (PDT)
Message-ID: <4FB0723E.2000601@cs.ucla.edu>
Date: Sun, 13 May 2012 19:47:26 -0700
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
User-Agent: Mozilla/5.0 (X11; Linux i686;
	rv:12.0) Gecko/20120430 Thunderbird/12.0.1
MIME-Version: 1.0
To: Stefano Lattarini <stefano.lattarini@gmail.com>
References: <15e94d5be7a8e68cbd4872951573375b3d39b19c.1336914999.git.stefano.lattarini@gmail.com>
In-Reply-To: <15e94d5be7a8e68cbd4872951573375b3d39b19c.1336914999.git.stefano.lattarini@gmail.com>
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] [PATCH] build: don't use 'AM_PROG_CC_STDC',
 is obsolete
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, 14 May 2012 02:47:29 -0000

Thanks, I pushed that in your name.


From MAILER-DAEMON Tue May 15 02:35:38 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SUBMA-0006jt-J0
	for mharc-bug-diffutils@gnu.org; Tue, 15 May 2012 02:35:38 -0400
Received: from eggs.gnu.org ([208.118.235.92]:52717)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUBM2-0006j1-VB
	for bug-diffutils@gnu.org; Tue, 15 May 2012 02:35:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUBLv-00058v-RZ
	for bug-diffutils@gnu.org; Tue, 15 May 2012 02:35:30 -0400
Received: from smtp.cs.ucla.edu ([131.179.128.62]:54369)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>)
	id 1SUBLv-00058m-GQ; Tue, 15 May 2012 02:35:23 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp.cs.ucla.edu (Postfix) with ESMTP id 64DA5A60003;
	Mon, 14 May 2012 23:35:21 -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 9SRmDfFr6uwj; Mon, 14 May 2012 23:35:20 -0700 (PDT)
Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200])
	by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 0B7BAA60002;
	Mon, 14 May 2012 23:35:20 -0700 (PDT)
Message-ID: <4FB1F927.7040609@cs.ucla.edu>
Date: Mon, 14 May 2012 23:35:19 -0700
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:11.0) Gecko/20120329 Thunderbird/11.0.1
MIME-Version: 1.0
To: bug-diffutils@gnu.org
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: Eli Zaretskii <eliz@gnu.org>, Bruno Haible <bruno@clisp.org>
Subject: [bug-diffutils] [PATCH] main: port subcommands to mingw
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: Tue, 15 May 2012 06:35:37 -0000

I pushed the following patch to diffutils, in the hope
that it solves the remaining mingw problems.  I have not
tested this on mingw; just on GNU/Linux.

----
Problem reported by Eli Zaretskii in
<http://lists.gnu.org/archive/html/bug-gnu-utils/2012-05/msg00013.html>.
Approach suggested by Bruno Haible as option (4) in
<http://lists.gnu.org/archive/html/bug-gnu-utils/2012-05/msg00036.html>.
* bootstrap.conf (gnulib_modules): Add system-quote.
* src/diff3.c, src/sdiff.c, src/util.c:
Include <system-quote.h>, not <sh-quote.h>.
* src/diff3.c (read_diff):
* src/sdiff.c (main, edit):
* src/util.c (begin_output):
Use system_quote_argv, for portability to Mingw.
* src/sdiff.c (NUM_SIGS, handler_index_of_SIGINT): Now enum
values, not macros; this is cleaner and avoids a GCC warning if
!HAVE_WORKING_VFORK.
* src/util.c (begin_output) [! HAVE_WORKING_FORK]: Do not use -f,
for consistency with the HAVE_WORKING_FORK code.
---
 bootstrap.conf |    1 +
 src/diff3.c    |   39 +++++++++------------------------------
 src/sdiff.c    |   41 +++++++++++++----------------------------
 src/util.c     |   19 ++++++++++---------
 4 files changed, 33 insertions(+), 67 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 55f0837..3954c4d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -69,6 +69,7 @@ strftime
 strptime
 strtoumax
 sys_wait
+system-quote
 unistd
 unlocked-io
 update-copyright
diff --git a/src/diff3.c b/src/diff3.c
index 3b01071..e234401 100644
--- a/src/diff3.c
+++ b/src/diff3.c
@@ -29,7 +29,7 @@
 #include <file-type.h>
 #include <getopt.h>
 #include <progname.h>
-#include <sh-quote.h>
+#include <system-quote.h>
 #include <version-etc.h>
 #include <xalloc.h>
 #include <xfreopen.h>
@@ -1161,13 +1161,15 @@ read_diff (char const *filea,
   int fd, wstatus, status;
   int werrno = 0;
   struct stat pipestat;
-
-#if HAVE_WORKING_FORK
-
   char const *argv[9];
   char const **ap;
+#if HAVE_WORKING_FORK
   int fds[2];
   pid_t pid;
+#else
+  FILE *fpipe;
+  char *command;
+#endif
 
   ap = argv;
   *ap++ = diff_program;
@@ -1181,6 +1183,8 @@ read_diff (char const *filea,
   *ap++ = fileb;
   *ap = 0;
 
+#if HAVE_WORKING_FORK
+
   if (pipe (fds) != 0)
     perror_with_exit ("pipe");
 
@@ -1210,32 +1214,7 @@ read_diff (char const *filea,
 
 #else
 
-  FILE *fpipe;
-  char const args[] = " --horizon-lines=100 -- ";
-  char *command = xmalloc (shell_quote_length (diff_program)
-			   + sizeof "-a"
-			   + sizeof "--strip-trailing-cr"
-			   + sizeof args - 1
-			   + shell_quote_length (filea) + 1
-			   + shell_quote_length (fileb) + 1);
-  char *p = command;
-  p = shell_quote_copy (p, diff_program);
-  if (text)
-    {
-      strcpy (p, " -a");
-      p += 3;
-    }
-  if (strip_trailing_cr)
-    {
-      strcpy (p, " --strip-trailing-cr");
-      p += 20;
-    }
-  strcpy (p, args);
-  p += sizeof args - 1;
-  p = shell_quote_copy (p, filea);
-  *p++ = ' ';
-  p = shell_quote_copy (p, fileb);
-  *p = 0;
+  command = system_quote_argv (SCI_SYSTEM, (char **) argv);
   errno = 0;
   fpipe = popen (command, "r");
   if (!fpipe)
diff --git a/src/sdiff.c b/src/sdiff.c
index 63b2861..e82ec84 100644
--- a/src/sdiff.c
+++ b/src/sdiff.c
@@ -31,7 +31,7 @@
 #include <file-type.h>
 #include <getopt.h>
 #include <progname.h>
-#include <sh-quote.h>
+#include <system-quote.h>
 #include <version-etc.h>
 #include <xalloc.h>
 
@@ -66,7 +66,6 @@ static void perror_fatal (char const *) __attribute__((noreturn));
 static void trapsigs (void);
 static void untrapsig (int);
 
-#define NUM_SIGS (sizeof sigs / sizeof *sigs)
 static int const sigs[] = {
 #ifdef SIGHUP
        SIGHUP,
@@ -87,8 +86,12 @@ static int const sigs[] = {
        SIGPIPE,
 #endif
        SIGINT
-#define handler_index_of_SIGINT (NUM_SIGS - 1)
 };
+enum
+  {
+    NUM_SIGS = sizeof sigs / sizeof *sigs,
+    handler_index_of_SIGINT = NUM_SIGS - 1
+  };
 
 #if HAVE_SIGACTION
   /* Prefer 'sigaction' if available, since 'signal' can lose signals.  */
@@ -607,19 +610,7 @@ main (int argc, char *argv[])
 
 #if ! HAVE_WORKING_FORK
       {
-	size_t cmdsize = 1;
-	char *p, *command;
-	int i;
-
-	for (i = 0;  diffargv[i];  i++)
-	  cmdsize += shell_quote_length (diffargv[i]) + 1;
-	command = p = xmalloc (cmdsize);
-	for (i = 0;  diffargv[i];  i++)
-	  {
-	    p = shell_quote_copy (p, diffargv[i]);
-	    *p++ = ' ';
-	  }
-	p[-1] = 0;
+	char *command = system_quote_argv (SCI_SYSTEM, (char **) diffargv);
 	errno = 0;
 	diffout = popen (command, "r");
 	if (! diffout)
@@ -1020,16 +1011,17 @@ edit (struct line_filter *left, char const *lname, lin lline, lin llen,
 	    {
 	      int wstatus;
 	      int werrno = 0;
+	      char const *argv[3];
+
 	      ignore_SIGINT = true;
 	      checksigs ();
+	      argv[0] = editor_program;
+	      argv[1] = tmpname;
+	      argv[2] = 0;
 
 	      {
 #if ! HAVE_WORKING_FORK
-		char *command =
-		  xmalloc (shell_quote_length (editor_program)
-			   + 1 + strlen (tmpname) + 1);
-		sprintf (shell_quote_copy (command, editor_program),
-			 " %s", tmpname);
+		char *command = system_quote_argv (SCI_SYSTEM, (char **) argv);
 		wstatus = system (command);
 		if (wstatus == -1)
 		  werrno = errno;
@@ -1040,13 +1032,6 @@ edit (struct line_filter *left, char const *lname, lin lline, lin llen,
 		pid = fork ();
 		if (pid == 0)
 		  {
-		    char const *argv[3];
-		    int i = 0;
-
-		    argv[i++] = editor_program;
-		    argv[i++] = tmpname;
-		    argv[i] = 0;
-
 		    execvp (editor_program, (char **) argv);
 		    _exit (errno == ENOENT ? 127 : 126);
 		  }
diff --git a/src/util.c b/src/util.c
index 2b0bbbf..38b33ef 100644
--- a/src/util.c
+++ b/src/util.c
@@ -21,7 +21,7 @@
 #include "diff.h"
 #include <dirname.h>
 #include <error.h>
-#include <sh-quote.h>
+#include <system-quote.h>
 #include <xalloc.h>
 
 char const pr_program[] = PR_PROGRAM;
@@ -187,9 +187,16 @@ begin_output (void)
 
   if (paginate)
     {
+      char const *argv[4];
+
       if (fflush (stdout) != 0)
 	pfatal_with_name (_("write failed"));
 
+      argv[0] = pr_program;
+      argv[1] = "-h";
+      argv[2] = name;
+      argv[3] = 0;
+
       /* Make OUTFILE a pipe to a subsidiary 'pr'.  */
       {
 #if HAVE_WORKING_FORK
@@ -212,7 +219,7 @@ begin_output (void)
 		close (pipes[0]);
 	      }
 
-	    execl (pr_program, pr_program, "-h", name, (char *) 0);
+	    execv (pr_program, (char **) argv);
 	    _exit (errno == ENOENT ? 127 : 126);
 	  }
 	else
@@ -223,13 +230,7 @@ begin_output (void)
 	      pfatal_with_name ("fdopen");
 	  }
 #else
-	char *command = xmalloc (sizeof pr_program - 1 + 7
-				 + shell_quote_length (name) + 1);
-	char *p;
-	sprintf (command, "%s -f -h ", pr_program);
-	p = command + sizeof pr_program - 1 + 7;
-	p = shell_quote_copy (p, name);
-	*p = 0;
+	char *command = system_quote_argv (SCI_SYSTEM, (char **) argv);
 	errno = 0;
 	outfile = popen (command, "w");
 	if (!outfile)
-- 
1.7.6.5



From MAILER-DAEMON Tue May 15 02:37:21 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SUBNp-0006r4-RI
	for mharc-bug-diffutils@gnu.org; Tue, 15 May 2012 02:37:21 -0400
Received: from eggs.gnu.org ([208.118.235.92]:53000)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUBNn-0006qj-HQ
	for bug-diffutils@gnu.org; Tue, 15 May 2012 02:37:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUBNl-0005Iy-GO
	for bug-diffutils@gnu.org; Tue, 15 May 2012 02:37:19 -0400
Received: from smtp.cs.ucla.edu ([131.179.128.62]:59996)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUBNl-0005Iq-7g
	for bug-diffutils@gnu.org; Tue, 15 May 2012 02:37:17 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp.cs.ucla.edu (Postfix) with ESMTP id D5914A60003
	for <bug-diffutils@gnu.org>; Mon, 14 May 2012 23:37:15 -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 hK9C0NsPO6sG for <bug-diffutils@gnu.org>;
	Mon, 14 May 2012 23:37:15 -0700 (PDT)
Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200])
	by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 11382A60002
	for <bug-diffutils@gnu.org>; Mon, 14 May 2012 23:37:15 -0700 (PDT)
Message-ID: <4FB1F99A.8050400@cs.ucla.edu>
Date: Mon, 14 May 2012 23:37:14 -0700
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:11.0) Gecko/20120329 Thunderbird/11.0.1
MIME-Version: 1.0
To: bug-diffutils@gnu.org
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
Subject: [bug-diffutils] maint: update bootstrap from gnulib
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: Tue, 15 May 2012 06:37:21 -0000

I pushed this:

diff --git a/bootstrap b/bootstrap
index 1f2f4f4..ce37a2c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-05-13.09; # UTC
+scriptversion=2012-05-15.06; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -307,7 +307,7 @@ insert_sorted_if_absent() {
   file=$1
   str=$2
   test -f $file || touch $file
-  echo "$str" | sort_patterns - $file | cmp - $file > /dev/null \
+  echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \
     || { echo "$str" | sort_patterns - $file > $file.bak \
       && mv $file.bak $file; } \
     || exit 1
@@ -754,6 +754,22 @@ symlink_to_dir()
   }
 }
 
+version_controlled_file() {
+  parent=$1
+  file=$2
+  if test -d .git; then
+    git rm -n "$file" > /dev/null 2>&1
+  elif test -d .svn; then
+    svn log -r HEAD "$file" > /dev/null 2>&1
+  elif test -d CVS; then
+    grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null |
+             grep '^/[^/]*/[0-9]' > /dev/null
+  else
+    echo "$me: no version control for $file?" >&2
+    false
+  fi
+}
+
 # NOTE: we have to be careful to run both autopoint and libtoolize
 # before gnulib-tool, since gnulib-tool is likely to provide newer
 # versions of files "installed" by these two programs.
@@ -766,43 +782,54 @@ with_gettext=yes
 grep '^[	 ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
     with_gettext=no
 
-if test $with_gettext = yes; then
-  # Released autopoint has the tendency to install macros that have been
-  # obsoleted in current gnulib, so run this before gnulib-tool.
-  echo "$0: $AUTOPOINT --force"
-  $AUTOPOINT --force || exit
-fi
+if test $with_gettext = yes || test $use_libtool = 1; then
 
-# Autoreconf runs aclocal before libtoolize, which causes spurious
-# warnings if the initial aclocal is confused by the libtoolized
-# (or worse out-of-date) macro directory.
-# libtoolize 1.9b added the --install option; but we support back
-# to libtoolize 1.5.22, where the install action was default.
-if test $use_libtool = 1; then
-  install=
-  case $($LIBTOOLIZE --help) in
-    *--install*) install=--install ;;
-  esac
-  echo "running: $LIBTOOLIZE $install --copy"
-  $LIBTOOLIZE $install --copy
-fi
+  tempbase=.bootstrap$$
+  trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15
 
-version_controlled_file() {
-  dir=$1
-  file=$2
-  found=no
-  if test -d CVS; then
-    grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
-             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
-  elif test -d .git; then
-    git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
-  elif test -d .svn; then
-    svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
-  else
-    echo "$me: no version control for $dir/$file?" >&2
+  > $tempbase.0 > $tempbase.1 &&
+  find . ! -type d -print | sort > $tempbase.0 || exit
+
+  if test $with_gettext = yes; then
+    # Released autopoint has the tendency to install macros that have been
+    # obsoleted in current gnulib, so run this before gnulib-tool.
+    echo "$0: $AUTOPOINT --force"
+    $AUTOPOINT --force || exit
   fi
-  test $found = yes
-}
+
+  # Autoreconf runs aclocal before libtoolize, which causes spurious
+  # warnings if the initial aclocal is confused by the libtoolized
+  # (or worse out-of-date) macro directory.
+  # libtoolize 1.9b added the --install option; but we support back
+  # to libtoolize 1.5.22, where the install action was default.
+  if test $use_libtool = 1; then
+    install=
+    case $($LIBTOOLIZE --help) in
+      *--install*) install=--install ;;
+    esac
+    echo "running: $LIBTOOLIZE $install --copy"
+    $LIBTOOLIZE $install --copy
+  fi
+
+  find . ! -type d -print | sort >$tempbase.1
+  old_IFS=$IFS
+  IFS=$nl
+  for file in $(comm -13 $tempbase.0 $tempbase.1); do
+    IFS=$old_IFS
+    parent=${file%/*}
+    version_controlled_file "$parent" "$file" || {
+      for dot_ig in x $vc_ignore; do
+        test $dot_ig = x && continue
+        ig=$parent/$dot_ig
+        insert_vc_ignore "$ig" "${file##*/}"
+      done
+    }
+  done
+  IFS=$old_IFS
+
+  rm -f $tempbase.0 $tempbase.1
+  trap - 1 2 13 15
+fi
 
 # Import from gnulib.
 


From MAILER-DAEMON Tue May 15 02:38:56 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SUBPM-0006ze-2U
	for mharc-bug-diffutils@gnu.org; Tue, 15 May 2012 02:38:56 -0400
Received: from eggs.gnu.org ([208.118.235.92]:53163)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUBPE-0006yx-Tz
	for bug-diffutils@gnu.org; Tue, 15 May 2012 02:38:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUBP8-0005V3-QU
	for bug-diffutils@gnu.org; Tue, 15 May 2012 02:38:48 -0400
Received: from smtp.cs.ucla.edu ([131.179.128.62]:60045)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUBP8-0005Uu-KD
	for bug-diffutils@gnu.org; Tue, 15 May 2012 02:38:42 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp.cs.ucla.edu (Postfix) with ESMTP id 420CBA60003
	for <bug-diffutils@gnu.org>; Mon, 14 May 2012 23:38:41 -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 U7YCxFEwjJ0k for <bug-diffutils@gnu.org>;
	Mon, 14 May 2012 23:38:40 -0700 (PDT)
Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200])
	by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 6E9F7A60002
	for <bug-diffutils@gnu.org>; Mon, 14 May 2012 23:38:40 -0700 (PDT)
Message-ID: <4FB1F9F0.5050904@cs.ucla.edu>
Date: Mon, 14 May 2012 23:38:40 -0700
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:11.0) Gecko/20120329 Thunderbird/11.0.1
MIME-Version: 1.0
To: bug-diffutils@gnu.org
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
Subject: [bug-diffutils] [PATCH] maint: m4/gnulib-cache.m4 is not under
	version control
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: Tue, 15 May 2012 06:38:55 -0000

This is like what coreutils does, and suppresses 'git status' chatter.
* .gitignore: Add /m4/gnulib-cache.m4.
---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2252cc2..7236c0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@
 /lib/unused-parameter.h
 /lib/warn-on-use.h
 /m4/.gitignore
+/m4/gnulib-cache.m4
 /maint.mk
 /po/*.pot
 /po/*.sed
-- 
1.7.6.5



From MAILER-DAEMON Tue May 15 03:02:35 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SUBmF-0002h2-GF
	for mharc-bug-diffutils@gnu.org; Tue, 15 May 2012 03:02:35 -0400
Received: from eggs.gnu.org ([208.118.235.92]:52194)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUBm2-0002fG-Ru
	for bug-diffutils@gnu.org; Tue, 15 May 2012 03:02:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUBlu-0001bO-VB
	for bug-diffutils@gnu.org; Tue, 15 May 2012 03:02:22 -0400
Received: from smtp.cs.ucla.edu ([131.179.128.62]:43132)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>)
	id 1SUBlu-0001au-H4; Tue, 15 May 2012 03:02:14 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp.cs.ucla.edu (Postfix) with ESMTP id 0B0B6A60003;
	Tue, 15 May 2012 00:02:11 -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 PHvOCqs5ISxa; Tue, 15 May 2012 00:02:09 -0700 (PDT)
Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200])
	by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 3D2C2A60002;
	Tue, 15 May 2012 00:02:09 -0700 (PDT)
Message-ID: <4FB1FF70.6050802@cs.ucla.edu>
Date: Tue, 15 May 2012 00:02:08 -0700
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:11.0) Gecko/20120329 Thunderbird/11.0.1
MIME-Version: 1.0
To: bug-diffutils@gnu.org
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: Eli Zaretskii <eliz@gnu.org>
Subject: [bug-diffutils] [PATCH] maint: remove ms subdirectory
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: Tue, 15 May 2012 07:02:34 -0000

Here's a proposed diffutils patch to simplify the code by removing
the now-obsolete DJGPP stuff.  I have not pushed this.

=====

diffutils is now designed to build with Cygwin or MinGW.
The old DJGPP stuff probably doesn't work anyway.
* Makefile.am (SUBDIRS): Remove ms.
* NEWS: Document this.
* configure.ac (AC_CONFIG_FILES): Remove ms/Makefile.
* ms/Makefile.am, ms/README, ms/config.bat, ms/config.sed:
* ms/config.site: Remove.
---
 Makefile.am    |    2 +-
 NEWS           |    5 +
 configure.ac   |    1 -
 ms/Makefile.am |   18 ----
 ms/README      |   64 --------------
 ms/config.bat  |  259 --------------------------------------------------------
 ms/config.sed  |   85 ------------------
 ms/config.site |   78 -----------------
 8 files changed, 6 insertions(+), 506 deletions(-)
 delete mode 100644 ms/Makefile.am
 delete mode 100644 ms/README
 delete mode 100644 ms/config.bat
 delete mode 100644 ms/config.sed
 delete mode 100644 ms/config.site

diff --git a/Makefile.am b/Makefile.am
index 73cac49..dcd4b74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
 ALL_RECURSIVE_TARGETS =
 
 EXTRA_DIST = bootstrap exgettext ChangeLog-2008 cfg.mk dist-check.mk
-SUBDIRS = lib src tests doc man po ms gnulib-tests
+SUBDIRS = lib src tests doc man po gnulib-tests
 
 ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
diff --git a/NEWS b/NEWS
index 5a69cd7..567fa3d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,11 @@ GNU diffutils NEWS                                    -*- outline -*-
   --new-file (-N) and --unidirectional-new-file now allow comparisons to "-".
   A standard input that's closed acts like a nonexistent file.
 
+** Packaging
+
+  diffutils is now designed to build with Cygwin or MinGW rather than DJGPP.
+  The ms subdirectory has been removed.
+
 
 * Noteworthy changes in release 3.2 (2011-09-02) [stable]
 
diff --git a/configure.ac b/configure.ac
index cf71ade..d6e52c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,6 +168,5 @@ AC_CONFIG_FILES([
   gnulib-tests/Makefile
   man/Makefile
   po/Makefile.in
-  ms/Makefile
 ])
 AC_OUTPUT
diff --git a/ms/Makefile.am b/ms/Makefile.am
deleted file mode 100644
index 2296d6a..0000000
--- a/ms/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-# Makefile for GNU diffutils sources used on Microsoft operating systems.
-
-# Copyright (C) 2001-2002, 2009-2012 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-EXTRA_DIST = config.bat config.sed config.site
diff --git a/ms/README b/ms/README
deleted file mode 100644
index 93a9074..0000000
--- a/ms/README
+++ /dev/null
@@ -1,64 +0,0 @@
-This directory contains files required to build GNU Diffutils on
-MS_DOS and MS-Windows using the DJGPP tools.
-
-To build Diffutils, you will need the following packages:
-
-    . the basic DJGPP development kit: GCC, Binutils, and djdevNNN.zip
-    . a DJGPP port of Bash (bsh204b.zip)
-    . GNU Fileutils (fil40b.zip)
-    . GNU Textutils (txt20b.zip)
-    . GNU Sh-utils (shl112b.zip)
-    . GNU Grep (grep24b.zip)
-    . GNU Awk (gwk306b.zip)
-    . GNU Sed (sed302b.zip)
-    . GNU Make (mak3791b.zip)
-
-The package names in parentheses indicate the oldest version which
-should work; newer versions are okay.  All those packages can be found
-on the usual DJGPP sites, in the v2gnu directory.  Please see
-<http://www.delorie.com/djgpp/getting.html> for a list of DJGPP sites.
-
-The source distribution of Diffutils you find on DJGPP sites comes
-preconfigured for the latest officially released version of the DJGPP
-library, and without NLS support.  If that is what you have installed,
-and if you don't need NLS support in Diffutils, you don't need to run
-the configure script; proceed directly to the "make" step below.
-
-If you are building the official GNU distribution, or your library is
-not the latest official release, or if you modified your headers or
-installed optional libraries, or if you want to have NLS support in
-Diffutils, you will have to reconfigure the package.  To this end,
-after unpacking the sources, chdir to the top-level directory created
-by unpacking, and type this command:
-
-   ms\config [nls]
-
-The "nls" option, if given, will configure the package for NLS
-support.
-
-This will run for a while and create the Makefile's and the config.h
-header file.
-
-Next type "make"; this will build the programs.
-
-To install the package, type "make install".
-
-That's it!
-
------
-Copyright (C) 2001, 2009-2012 Free Software Foundation, Inc.
-
-This file is part of GNU DIFF.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/ms/config.bat b/ms/config.bat
deleted file mode 100644
index 57d5f3f..0000000
--- a/ms/config.bat
+++ /dev/null
@@ -1,259 +0,0 @@
-@echo off

-

-echo Configuring GNU Diffutils for DJGPP v2.x...

-

-Rem Copyright (C) 2001, 2009-2012 Free Software Foundation, Inc.

-

-Rem This program is free software: you can redistribute it and/or modify

-Rem it under the terms of the GNU General Public License as published by

-Rem the Free Software Foundation, either version 3 of the License, or

-Rem (at your option) any later version.

-

-Rem This program is distributed in the hope that it will be useful,

-Rem but WITHOUT ANY WARRANTY; without even the implied warranty of

-Rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-Rem GNU General Public License for more details.

-

-Rem You should have received a copy of the GNU General Public License

-Rem along with this program.  If not, see <http://www.gnu.org/licenses/>.

-

-Rem Written by Eli Zaretskii.

-

-

-Rem The small_env tests protect against fixed and too small size

-Rem of the environment in stock DOS shell.

-

-Rem Find out if NLS is wanted or not,

-Rem if dependency-tracking is wanted or not,

-Rem if cache is wanted or not

-Rem and where the sources are.

-set ARGS=

-set NLS=disabled

-if not "%NLS%" == "disabled" goto small_env

-set CACHE=enabled

-if not "%CACHE%" == "enabled" goto small_env

-set DEPENDENCY_TRACKING=disabled

-if not "%DEPENDENCY_TRACKING%" == "disabled" goto small_env

-set XSRC=.

-if not "%XSRC%" == "." goto small_env

-

-Rem Loop over all arguments.

-Rem Special arguments are: NLS, XSRC CACHE and DEPS.

-Rem All other arguments are stored into ARGS.

-:arg_loop

-set SPECIAL_ARG_SEEN=0

-if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env

-if "%1" == "NLS" goto nls_on

-if not "%1" == "nls" goto CacheOpt

-:nls_on

-if "%1" == "nls" set NLS=enabled

-if "%1" == "NLS" set NLS=enabled

-if not "%NLS%" == "enabled" goto small_env

-set SPECIAL_ARG_SEEN=1

-if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env

-shift

-:CacheOpt

-set SPECIAL_ARG_SEEN=0

-if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env

-if "%1" == "no-cache" goto cache_off

-if "%1" == "no-CACHE" goto cache_off

-if not "%1" == "NO-CACHE" goto dependency_opt

-:cache_off

-if "%1" == "no-cache" set CACHE=disabled

-if "%1" == "no-CACHE" set CACHE=disabled

-if "%1" == "NO-CACHE" set CACHE=disabled

-if not "%CACHE%" == "disabled" goto small_env

-set SPECIAL_ARG_SEEN=1

-if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env

-shift

-:dependency_opt

-set SPECIAL_ARG_SEEN=0

-if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env

-if "%1" == "dep" goto dep_off

-if not "%1" == "DEP" goto src_dir_opt

-:dep_off

-if "%1" == "dep" set DEPENDENCY_TRACKING=enabled

-if "%1" == "DEP" set DEPENDENCY_TRACKING=enabled

-if not "%DEPENDENCY_TRACKING%" == "enabled" goto small_env

-set SPECIAL_ARG_SEEN=1

-if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env

-shift

-:src_dir_opt

-set SPECIAL_ARG_SEEN=0

-if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env

-echo %1 | grep -q "/"

-if errorlevel 1 goto collect_arg

-set XSRC=%1

-if not "%XSRC%" == "%1" goto small_env

-set SPECIAL_ARG_SEEN=1

-if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env

-:collect_arg

-if "%SPECIAL_ARG_SEEN%" == "0" set _ARGS=%ARGS% %1

-if "%SPECIAL_ARG_SEEN%" == "0" if not "%_ARGS%" == "%ARGS% %1" goto small_env

-echo %_ARGS% | grep -q "[^ ]"

-if not errorlevel 0 set ARGS=%_ARGS%

-set _ARGS=

-shift

-if not "%1" == "" goto arg_loop

-set SPECIAL_ARG_SEEN=

-

-Rem Create a response file for the configure script.

-echo --srcdir=%XSRC% > arguments

-if "%CACHE%" == "enabled"                echo --config-cache >> arguments

-if "%DEPENDENCY_TRACKING%" == "enabled"  echo --enable-dependency-tracking >> arguments

-if "%DEPENDENCY_TRACKING%" == "disabled" echo --disable-dependency-tracking >> arguments

-if not "%ARGS%" == ""                    echo %ARGS% >> arguments

-set ARGS=

-set CACHE=

-set DEPENDENCY_TRACKING=

-

-if "%XSRC%" == "." goto in_place

-

-:not_in_place

-redir -e /dev/null update %XSRC%/configure.orig ./configure

-test -f ./configure

-if errorlevel 1 update %XSRC%/configure ./configure

-

-:in_place

-Rem Update configuration files

-echo Updating configuration scripts...

-test -f ./configure.orig

-if errorlevel 1 update configure configure.orig

-sed -f %XSRC%/ms/config.sed configure.orig > configure

-if errorlevel 1 goto sed_error

-

-Rem Make sure they have a config.site file

-set CONFIG_SITE=%XSRC%/ms/config.site

-if not "%CONFIG_SITE%" == "%XSRC%/ms/config.site" goto small_env

-

-Rem Make sure crucial file names are not munged by unpacking

-test -f %XSRC%/po/Makefile.in.in

-if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in

-test -f %XSRC%/m4/Makefile.am.in

-if not errorlevel 1 mv -f %XSRC%/m4/Makefile.am.in %XSRC%/m4/Makefile.am-in

-

-Rem This is required because DOS/Windows are case-insensitive

-Rem to file names, and "make install" will do nothing if Make

-Rem finds a file called 'install'.

-if exist INSTALL ren INSTALL INSTALL.txt

-

-Rem Set HOME to a sane default so configure stops complaining.

-if not "%HOME%" == "" goto HostName

-set HOME=%XSRC%/ms

-if not "%HOME%" == "%XSRC%/ms" goto small_env

-echo No HOME found in the environment, using default value

-

-:HostName

-Rem Set HOSTNAME so it shows in config.status

-if not "%HOSTNAME%" == "" goto hostdone

-if "%windir%" == "" goto msdos

-set OS=MS-Windows

-if not "%OS%" == "MS-Windows" goto small_env

-goto haveos

-:msdos

-set OS=MS-DOS

-if not "%OS%" == "MS-DOS" goto small_env

-:haveos

-if not "%USERNAME%" == "" goto haveuname

-if not "%USER%" == "" goto haveuser

-echo No USERNAME and no USER found in the environment, using default values

-set HOSTNAME=Unknown PC

-if not "%HOSTNAME%" == "Unknown PC" goto small_env

-goto userdone

-:haveuser

-set HOSTNAME=%USER%'s PC

-if not "%HOSTNAME%" == "%USER%'s PC" goto small_env

-goto userdone

-:haveuname

-set HOSTNAME=%USERNAME%'s PC

-if not "%HOSTNAME%" == "%USERNAME%'s PC" goto small_env

-:userdone

-set _HOSTNAME=%HOSTNAME%, %OS%

-if not "%_HOSTNAME%" == "%HOSTNAME%, %OS%" goto small_env

-set HOSTNAME=%_HOSTNAME%

-:hostdone

-set _HOSTNAME=

-set OS=

-

-Rem install-sh is required by the configure script but clashes with the

-Rem various Makefile install-foo targets, so we MUST have it before the

-Rem script runs and rename it afterwards

-test -f %XSRC%/install-sh

-if not errorlevel 1 goto no_ren0

-test -f %XSRC%/install-sh.sh

-if not errorlevel 1 mv -f %XSRC%/install-sh.sh %XSRC%/install-sh

-:no_ren0

-

-if "%NLS%" == "disabled" goto without_NLS

-

-:with_NLS

-Rem Check for the needed libraries and binaries.

-test -x /dev/env/DJDIR/bin/msgfmt.exe

-if not errorlevel 0 goto missing_NLS_tools

-test -x /dev/env/DJDIR/bin/xgettext.exe

-if not errorlevel 0 goto missing_NLS_tools

-test -f /dev/env/DJDIR/include/libcharset.h

-if not errorlevel 0 goto missing_NLS_tools

-test -f /dev/env/DJDIR/lib/libcharset.a

-if not errorlevel 0 goto missing_NLS_tools

-test -f /dev/env/DJDIR/include/iconv.h

-if not errorlevel 0 goto missing_NLS_tools

-test -f /dev/env/DJDIR/lib/libiconv.a

-if not errorlevel 0 goto missing_NLS_tools

-test -f /dev/env/DJDIR/include/libintl.h

-if not errorlevel 0 goto missing_NLS_tools

-test -f /dev/env/DJDIR/lib/libintl.a

-if not errorlevel 0 goto missing_NLS_tools

-

-Rem Recreate the files in the %XSRC%/po subdir with our ported tools.

-redir -e /dev/null rm %XSRC%/po/*.gmo

-redir -e /dev/null rm %XSRC%/po/diffutil*.pot

-redir -e /dev/null rm %XSRC%/po/cat-id-tbl.c

-redir -e /dev/null rm %XSRC%/po/stamp-cat-id

-

-Rem Update the arguments file for the configure script.

-Rem We prefer without-included-gettext because libintl.a from gettext package

-Rem is the only one that is guaranteed to have been ported to DJGPP.

-echo --enable-nls --without-included-gettext >> arguments

-goto configure_package

-

-:missing_NLS_tools

-echo Needed libs/tools for NLS not found. Configuring without NLS.

-:without_NLS

-Rem Update the arguments file for the configure script.

-echo --disable-nls >> arguments

-

-:configure_package

-echo Running the ./configure script...

-sh ./configure @arguments

-if errorlevel 1 goto cfg_error

-rm arguments

-echo Done.

-goto End

-

-:sed_error

-echo ./configure script editing failed!

-goto End

-

-:cfg_error

-echo ./configure script exited abnormally!

-goto End

-

-:small_env

-echo Your environment size is too small.  Enlarge it and run me again.

-echo Configuration NOT done!

-

-:End

-test -f %XSRC%/install-sh.sh

-if not errorlevel 1 goto no_ren1

-test -f %XSRC%/install-sh

-if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh

-:no_ren1

-if "%HOME%" == "%XSRC%/ms" set HOME=

-set ARGS=

-set CONFIG_SITE=

-set HOSTNAME=

-set NLS=

-set CACHE=

-set DEPENDENCY_TRACKING=

-set XSRC=

diff --git a/ms/config.sed b/ms/config.sed
deleted file mode 100644
index 0d40421..0000000
--- a/ms/config.sed
+++ /dev/null
@@ -1,85 +0,0 @@
-# Additional editing of Makefiles and of config.status
-
-# Copyright (C) 2001-2002, 2009-2012 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Written by Eli Zaretskii.
-
-
-/(echo[	 ]*':t/ a\
-# DJGPP specific Makefile changes.\
-  /^aliaspath *	*=/s,:,";",g;t t\
-  /TEXINPUTS=/s,:,";",g;t t\
-  /PATH=/s,:,";",g;t t\
-  s,\\.deps,_deps,g;t t\
-  s,\\.new\\.,_new.,g;t t\
-  s,\\.old\\.,_old.,g;t t\
-  s,\\.tab\\.,_tab.,g;t t\
-  s,Makefile\\.in\\.in,Makefile.in-in,g;t t\
-  s,Makefile\\.am\\.in,Makefile.am-in,g;t t\
-  /^install-info-am:/,/^$/ {\
-    /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& diff.i,\
-    s,\\(\\\$\\\$d/\\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$d/\\$\\$file[0-9] \\$\\$d/\\$\\$file[0-9][0-9]\\2,\
-    s,\\( \\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\
-  }\
-  /^uninstall-info-am:/,/^$/ {\
-    /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& diff.i,\
-    s,\\(file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\
-  }
-
-# Makefile.in.in is renamed to Makefile.in-in.
-/^ac_config_files=/,/_ACEOF/ {
-  s|po/Makefile\.in|&:po/Makefile.in-in|
-}
-/CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2
-
-# We always use _deps instead of .deps, because the latter is an
-# invalid name on 8+3 MS-DOS file system.  This makes the generated
-# Makefiles good for every DJGPP installation, not only the one
-# where the package was configured (which could happen to be a
-# Windows box, where leading dots in file names are allowed).
-s,\.deps,_deps,g
-
-# The following two items are changes needed for configuring
-# and compiling across partitions.
-# The given srcdir value is always translated from the
-# "x:" syntax into "/dev/x" syntax while we run configure.
-/^[	 ]*-srcdir=\*.*$/ a\
-    ac_optarg=`echo "$ac_optarg" | sed "s,^\\([A-Za-z]\\):,/dev/\\1,"`
-/set X `ls -Lt \$srcdir/ i\
-   if `echo $srcdir | grep "^/dev/" - > /dev/null`; then\
-     srcdir=`echo "$srcdir" | sed -e "s%^/dev/%%" -e "s%/%:/%"`\
-   fi
-
-# Autoconf 2.52e generated configure scripts write absolute paths into
-# Makefiles, making them useless for DJGPP installations other than the
-# one for which the package has been configured.
-/MISSING=/,/^$/ {
-  /^fi$/ a\
-am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/diffutil.*[-.]2.*[7-9].*[0-9]%${top_srcdir}%'`
-}
-/^install_sh=/a\
-install_sh=`echo "$install_sh" | sed 's%/dev.*/diffutil.*[-.]2.*[7-9].*[0-9]%${top_srcdir}%'`
-
-
-# The following makes sure we are not going to remove a directory
-# which is the cwd on its drive (DOS doesn't allow to remove such
-# a directory).  The trick is to chdir to the root directory on
-# temp directory's drive.
-/^ *trap 'exit_status=\$\?; rm -rf/s%rm -rf%cd $tmp; cd /; &%
-
-# AC_CONFIG_LINKS fails if the source and destination are on
-# different file systems and symlinks don't work.
-/^    ln \$srcdir/s%||%|| cp -pf $srcdir/$ac_source $ac_dest ||%
diff --git a/ms/config.site b/ms/config.site
deleted file mode 100644
index c863616..0000000
--- a/ms/config.site
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh
-# Site defaults for the DJGPP configuration
-
-# Copyright (C) 2001, 2009-2012 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Written by Eli Zaretskii.
-
-
-# These two variables are required, otherwise looking for
-# programs along the PATH will not work.
-PATH_SEPARATOR=:
-PATH_EXPAND=y
-
-# This is required in for "test -f foo" to find foo.exe.
-export TEST_FINDS_EXE=y
-
-# The root of the DJGPP tree serves as the default prefix
-# for all paths that are hardcoded in the binaries.
-# When installing the installation prefix must be supplied.
-test "x$prefix" = xNONE && prefix='/dev/env/DJDIR'
-
-# This is required for config.status script to be run, since
-# ./configure runs it by invoking ${CONFIG_SHELL-/bin/sh}
-# CONFIG_SHELL=${CONFIG_SHELL='sh'}
-
-# These are set here so the generated Makefile's will be good
-# for every DJGPP installation, not only the one where the
-# package was configured.
-# $INSTALL must be an absolute path name, otherwise config.status
-# will try to prepend ./ and ../ to it when it goes into subdirs.
-INSTALL=${INSTALL='/dev/env/DJDIR/bin/ginstall -c'}
-RANLIB=${RANLIB='ranlib'}
-GMSGFMT=${GMSGFMT='/dev/env/DJDIR/bin/msgfmt'}
-MSGFMT=${MSGFMT='/dev/env/DJDIR/bin/msgfmt'}
-XGETTEXT=${XGETTEXT='/dev/env/DJDIR/bin/xgettext'}
-
-# Sane defaults for standard programs compiled into the package that
-# we are about to build.  Use .exe extension so that library functions
-# invoking these programs will provide a better diagnostics when a
-# program is not found: the library won't need to call the stock DOS
-# shell, which always returns a zero status, even if it doesn't find
-# the program.
-ac_cv_path_PR_PROGRAM=${PR_PROGRAM='/dev/env/DJDIR/bin/pr.exe'}
-
-# Sane defaults for standard programs used by the build process.
-# We force the values of these variables so that the resultant
-# Makefile's will work on any DJGPP platform, not only on the
-# machine where the package was configured.
-ac_cv_prog_AWK=${AWK='gawk'}
-ac_cv_prog_INTLBISON=${INTLBISON='bison'}
-ac_cv_prog_CC=${CC='gcc'}
-
-# These are set here so the generated libtool/Makefile's will
-# be good for every DJGPP installation, not only the one where
-# the package was configured.
-NM=${NM='nm'}
-LD=${LD='ld'}
-MAKEINFO=${MAKEINFO='makeinfo'}
-
-# Force the test for 'ln -s' to report 'cp -pf'.
-ac_cv_prog_LN_S='cp -pf'
-
-# We have 'fork', but it always fails.  Don't trust Autoconf to be
-# smart enough to detect that...
-ac_cv_func_fork=no
-- 
1.7.6.5



From MAILER-DAEMON Tue May 15 13:12:23 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SULIN-0003H5-Cy
	for mharc-bug-diffutils@gnu.org; Tue, 15 May 2012 13:12:23 -0400
Received: from eggs.gnu.org ([208.118.235.92]:37187)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1SUKBC-0002dh-U6
	for bug-diffutils@gnu.org; Tue, 15 May 2012 12:00:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1SUKB7-0000bN-DF
	for bug-diffutils@gnu.org; Tue, 15 May 2012 12:00:54 -0400
Received: from mtaout21.012.net.il ([80.179.55.169]:42753)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1SUKB6-0000ap-Md
	for bug-diffutils@gnu.org; Tue, 15 May 2012 12:00:49 -0400
Received: from conversion-daemon.a-mtaout21.012.net.il by
	a-mtaout21.012.net.il (HyperSendmail v2007.08) id
	<0M4200L00N504F00@a-mtaout21.012.net.il> for
	bug-diffutils@gnu.org; Tue, 15 May 2012 19:00:42 +0300 (IDT)
Received: from HOME-C4E4A596F7 ([87.69.210.75]) by a-mtaout21.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0M4200K8CN55O8G0@a-mtaout21.012.net.il>;
	Tue, 15 May 2012 19:00:42 +0300 (IDT)
Date: Tue, 15 May 2012 19:02:54 +0300
From: Eli Zaretskii <eliz@gnu.org>
In-reply-to: <4FB1FF70.6050802@cs.ucla.edu>
X-012-Sender: halo1@inter.net.il
To: Paul Eggert <eggert@cs.ucla.edu>
Message-id: <83zk99o2j5.fsf@gnu.org>
References: <4FB1FF70.6050802@cs.ucla.edu>
X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta)
X-Received-From: 80.179.55.169
X-Mailman-Approved-At: Tue, 15 May 2012 13:12:21 -0400
Cc: bug-diffutils@gnu.org
Subject: Re: [bug-diffutils] [PATCH] maint: remove ms subdirectory
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: Eli Zaretskii <eliz@gnu.org>
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: Tue, 15 May 2012 16:00:58 -0000

> Date: Tue, 15 May 2012 00:02:08 -0700
> From: Paul Eggert <eggert@cs.ucla.edu>
> CC: Eli Zaretskii <eliz@gnu.org>
> 
> Here's a proposed diffutils patch to simplify the code by removing
> the now-obsolete DJGPP stuff.  I have not pushed this.

The latest announcements of the DJGPP ports of Diffutils explicitly
tell that the ms/ stuff is not used.  See

  http://www.delorie.com/djgpp/mail-archives/browse.cgi?p=djgpp/2012/05/13/18:59:14

So I think you can safely push this.


From MAILER-DAEMON Tue May 15 17:05:09 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SUOvd-0001ah-8C
	for mharc-bug-diffutils@gnu.org; Tue, 15 May 2012 17:05:09 -0400
Received: from eggs.gnu.org ([208.118.235.92]:54197)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUOva-0001Xe-5S
	for bug-diffutils@gnu.org; Tue, 15 May 2012 17:05:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SUOvY-0002Og-Ao
	for bug-diffutils@gnu.org; Tue, 15 May 2012 17:05:05 -0400
Received: from smtp.cs.ucla.edu ([131.179.128.62]:45699)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>)
	id 1SUOvY-0002JY-4S; Tue, 15 May 2012 17:05:04 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp.cs.ucla.edu (Postfix) with ESMTP id 97B53A60004;
	Tue, 15 May 2012 14:05:00 -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 yDTrLzYMMvjE; Tue, 15 May 2012 14:05:00 -0700 (PDT)
Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200])
	by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 01EA3A60002;
	Tue, 15 May 2012 14:05:00 -0700 (PDT)
Message-ID: <4FB2C4FB.6000801@cs.ucla.edu>
Date: Tue, 15 May 2012 14:04:59 -0700
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:11.0) Gecko/20120329 Thunderbird/11.0.1
MIME-Version: 1.0
To: Eli Zaretskii <eliz@gnu.org>
References: <4FB1FF70.6050802@cs.ucla.edu> <83zk99o2j5.fsf@gnu.org>
In-Reply-To: <83zk99o2j5.fsf@gnu.org>
Content-Type: text/plain; charset=ISO-8859-1
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] [PATCH] maint: remove ms subdirectory
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: Tue, 15 May 2012 21:05:07 -0000

On 05/15/2012 09:02 AM, Eli Zaretskii wrote:
> So I think you can safely push this.

Thanks, I did that here:

http://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=1f281b36801627601f8a92f26e8ac6a0a7e36526


From MAILER-DAEMON Tue May 22 19:49:48 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SWypo-0004Iu-Ru
	for mharc-bug-diffutils@gnu.org; Tue, 22 May 2012 19:49:48 -0400
Received: from eggs.gnu.org ([208.118.235.92]:51906)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jan-benedict.glaw@getslash.de>) id 1SWmh7-0002No-5A
	for bug-diffutils@gnu.org; Tue, 22 May 2012 06:52:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jan-benedict.glaw@getslash.de>) id 1SWmgz-00013s-Mn
	for bug-diffutils@gnu.org; Tue, 22 May 2012 06:52:00 -0400
Received: from mail.getslash.de ([62.72.81.121]:50564)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jan-benedict.glaw@getslash.de>) id 1SWmgz-00012y-Dm
	for bug-diffutils@gnu.org; Tue, 22 May 2012 06:51:53 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by mail.getslash.de (Postfix) with ESMTP id 40B2C2C808F
	for <bug-diffutils@gnu.org>; Tue, 22 May 2012 10:51:49 +0000 (UTC)
Received: from mail.getslash.de ([127.0.0.1])
	by localhost (mail.getslash.de [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id GGpDAygFlBn2 for <bug-diffutils@gnu.org>;
	Tue, 22 May 2012 10:51:49 +0000 (UTC)
Received: from [192.168.221.6] (pd95bcf90.dip0.t-ipconnect.de [217.91.207.144])
	by mail.getslash.de (Postfix) with ESMTPSA
	for <bug-diffutils@gnu.org>; Tue, 22 May 2012 10:51:49 +0000 (UTC)
Message-ID: <4FBB6FC4.2030304@getslash.de>
Date: Tue, 22 May 2012 12:51:48 +0200
From: Jan-Benedict Glaw <jan-benedict.glaw@getslash.de>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:10.0.3) Gecko/20120329 Icedove/10.0.3
MIME-Version: 1.0
To: bug-diffutils@gnu.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 62.72.81.121
X-Mailman-Approved-At: Tue, 22 May 2012 19:49:47 -0400
Subject: [bug-diffutils] diff -u: start chunk actually even /before/ the
	first different line
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: Tue, 22 May 2012 10:52:07 -0000

Hi!

(Please Cc: me, I'm not on this list.)

Since years, I dislike the behavior of `diff -u' when you add
entries to an array of structs. The chunk is aligned so that it
starts with the first line that actually differs (plus context).
That isn't exactly wrong and will perfectly apply, but is a bit
awkward to read. Consider this patch:

--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -747,6 +747,14 @@ static const struct dmi_system_id intel_no_lvds[] =3D=
 {
         },
         {
                 .callback =3D intel_no_lvds_dmi_callback,
+               .ident =3D "Hewlett-Packard HP t5740e Thin Client",
+               .matches =3D {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "HP t5740e Thin Clien=
t"),
+               },
+       },
+       {
+               .callback =3D intel_no_lvds_dmi_callback,
                 .ident =3D "Hewlett-Packard t5745",
                 .matches =3D {
                         DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),


I added another entry to some table.  It could have looked like
this:


--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -747,6 +747,14 @@ static const struct dmi_system_id intel_no_lvds[] =3D=
 {
                 },

         },
+       {
+               .callback =3D intel_no_lvds_dmi_callback,
+               .ident =3D "Hewlett-Packard HP t5740e Thin Client",
+               .matches =3D {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "HP t5740e Thin Clien=
t"),
+               },
+       },
         {
                 .callback =3D intel_no_lvds_dmi_callback,
                 .ident =3D "Hewlett-Packard t5745",

(I edited this manually.) For a simple insertion, I moved up the whole ch=
unk by
two lines of context; in this case, it would visually represent what I ac=
tually
did.  I've not thought this to an end and this mail is ment to start a
discussion about it, but a proposed change could be to move a chunk up by=
 two
lines (which would be typical for a C source file I guess) if the resulti=
ng
patch still "does the same".  I'm not sure on how much stuff would need t=
o be
shifted up, and I'm probably already used to look at a patch and recogniz=
e the
pattern of an insertion to a C'ish table, but nontheless: If it isn't too=
 hard
to move the chunk window a bit up, that would improve readability of patc=
hes
like this.

Thanks a lot,
Jan-Benedict

--=20
Getslash GmbH, Bahnhofstra=DFe 16, 59302 Oelde
Tel: +49-2522-834349-5    Fax: +49-2522-834349-1
http://www.getslash.de
Sitz der Gesellschaft: Oelde
Handelsregister: Amtsgericht M=FCnster, HRB 11911
Ust-Id-Nr.: DE 815060326
Gesch=E4ftsf=FChrung: Andre Peitz, Tobias Hanisch


From MAILER-DAEMON Mon May 28 18:17:38 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SZ8Fu-0003j4-9J
	for mharc-bug-diffutils@gnu.org; Mon, 28 May 2012 18:17:38 -0400
Received: from eggs.gnu.org ([208.118.235.92]:60277)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@timroes.de>) id 1SZ31p-0001Jv-UB
	for bug-diffutils@gnu.org; Mon, 28 May 2012 12:42:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mail@timroes.de>) id 1SZ31n-0004C9-Sw
	for bug-diffutils@gnu.org; Mon, 28 May 2012 12:42:45 -0400
Received: from wrs-host-01.werosys.de ([78.46.110.70]:35985)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@timroes.de>) id 1SZ31n-0004Bi-JM
	for bug-diffutils@gnu.org; Mon, 28 May 2012 12:42:43 -0400
Received: from [192.168.1.42] (dslb-188-099-242-132.pools.arcor-ip.net
	[188.99.242.132]) (using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by wrs-host-01.werosys.de (Postfix) with ESMTPSA id C1F17B95AEA
	for <bug-diffutils@gnu.org>; Mon, 28 May 2012 18:42:37 +0200 (CEST)
Message-ID: <4FC3AAF7.9010405@timroes.de>
Date: Mon, 28 May 2012 18:42:31 +0200
From: Tim Roes <mail@timroes.de>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20120216 Icedove/8.0
MIME-Version: 1.0
To: bug-diffutils@gnu.org
Content-Type: multipart/signed; protocol="application/pkcs7-signature";
	micalg=sha1; boundary="------------ms020000080303040501010802"
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 78.46.110.70
X-Mailman-Approved-At: Mon, 28 May 2012 18:17:37 -0400
Subject: [bug-diffutils] time complexity of diff3
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, 28 May 2012 16:42:47 -0000

This is a cryptographically signed message in MIME format.

--------------ms020000080303040501010802
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: quoted-printable

Hi,

can anyone tell me what time complexity (linear, quadratic, cubic, ...)=20
diff3 has?
The algorithm as it is described in [1] seems to have O(n^3).
Unfortunately I didn't found any information about that in any=20
documentation (but might have missed it).

Thanks for your help,
Tim

[1] A formal investigation of Diff3 --=20
http://www.cis.upenn.edu/~bcpierce/papers/diff3-short.pdf

--=20
Tim Roes
Herrmann-Leichtlin-Str. 30
D-76185 Karlsruhe

www.timroes.de



--------------ms020000080303040501010802
Content-Type: application/pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"
Content-Description: S/MIME Cryptographic Signature

MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINTjCC
BjQwggQcoAMCAQICAR4wDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT
DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp
Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3
MTAyNDIxMDE1NVoXDTE3MTAyNDIxMDE1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T
dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu
aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs
aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcJg8zOLdgasSmkLhOr
lr6KMoOMpohBllVHrdRvEg/q6r8jR+EK75xCGhR8ToREoqe7zM9/UnC6TS2y9UKTpT1v7RSM
zR0t6ndl0TWBuUr/UXBhPk+Kmy7bI4yW4urC+y7P3/1/X7U8ocb8VpH/Clt+4iq7nirMcNh6
qJR+xjOhV+VHzQMALuGYn5KZmc1NbJQYclsGkDxDz2UbFqE2+6vIZoL+jb9x4Pa5gNf1TwSD
kOkikZB1xtB4ZqtXThaABSONdfmv/Z1pua3FYxnCFmdr/+N2JLKutIxMYqQOJebr/f/h5t95
m4JgrM3Y/w7YX9d7YAL9jvN4SydHsU6n65cCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB
Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRTcu2SnODaywFcfH6WNU7y1LhRgjAfBgNV
HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH
MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3
dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu
c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v
c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0
dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93
d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBAAqD
CH14qywGXLhjjF6uHLkjd02hcdh9hrw+VUsv+q1eeQWB21jWj3kJ96AUlPCoEGZ/ynJNScWy
6QMVQjbbMXltUfO4n4bGGdKo3awPWp61tjAFgraLJgDk+DsSvUD6EowjMTNx25GQgyYJ5RPI
zKKR9tQW8gGK+2+RHxkUCTbYFnL6kl8Ch507rUdPPipJ9CgJFws3kDS3gOS5WFMxcjO5DwKf
KSETEPrHh7p5shuuNktvsv6hxHTLhiMKX893gxdT3XLS9OKmCv87vkINQcNEcIIoFWbP9HOR
z9v3vQwR4e3ksLc2JZOAFK+ssS5XMEoznzpihEP0PLc4dCBYjbvSD7kxgDwZ+Aj8Q9PkbvE9
sIPP7ON0fz095HdThKjiVJe6vofq+n6b1NBc8XdrQvBmunwxD5nvtTW4vtN6VY7mUCmxsCie
uoBJ9OlqmsVWQvifIYf40dJPZkk9YgGTzWLpXDSfLSplbY2LL9C9U0ptvjcDjefLTvqSFc7t
w1sEhF0n/qpA2r0GpvkLRDmcSwVyPvmjFBGqUp/pNy8ZuPGQmHwFi2/14+xeSUDG2bwnsYJQ
G2EdJCB6luQ57GEnTA/yKZSTKI8dDQa8Sd3zfXb19mOgSF0bBdXbuKhEpuP9wirslFe6fQ1t
5j5R0xi72MZ8ikMu1RQZKCyDbMwazlHiMIIHEjCCBfqgAwIBAgIDAtAgMA0GCSqGSIb3DQEB
BQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20g
Q2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EwHhcNMTEwODA1MDA1OTMz
WhcNMTIwODA1MDY1NzExWjBcMSAwHgYDVQQNExc0Nzg2ODktMjV5eGVjeTBkMEZ5NDVXYTEY
MBYGA1UEAwwPbWFpbEB0aW1yb2VzLmRlMR4wHAYJKoZIhvcNAQkBFg9tYWlsQHRpbXJvZXMu
ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY9zOr028TvXpFJ/H/rW4mRqJk
hm2PnG7v+o6G3KaTBQIrJCHQWgP7HED6sWxsQ6DY3NWPlaGcT7PFjgYDXFmRIeei6BMDTQoM
mWHTALVD9V6nuBXN9qHn+9DYYGtnCAEkcf3TnGH4v4do+zwE3SrmgR8pZz+8GLqLFbztccv2
OpjR6unCPKO7bgIghNhwmYnM3d1DROrXCGwQaNSlxigcglqA0zAfXFIvxy6+1bhpG7YuQuhY
SnnkZEsLGF4KOsdYafUHJG/oqktVDXh+ky7tT9IwuapBizn1c8uTKw3gLm0RlfReWScJqfGz
5qPYjtxOEIst10rGqBDwoeBCbiZtAgMBAAGjggOqMIIDpjAJBgNVHRMEAjAAMAsGA1UdDwQE
AwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFICe+lQf4MTu
MyJyLIXAuBr+3jKAMB8GA1UdIwQYMBaAFFNy7ZKc4NrLAVx8fpY1TvLUuFGCMBoGA1UdEQQT
MBGBD21haWxAdGltcm9lcy5kZTCCAiEGA1UdIASCAhgwggIUMIICEAYLKwYBBAGBtTcBAgIw
ggH/MC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMDQG
CCsGAQUFBwIBFihodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9pbnRlcm1lZGlhdGUucGRmMIH3
BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEB
GoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3Mg
MSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCBy
ZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9m
IHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjCBnAYIKwYBBQUHAgIwgY8wJxYgU3Rh
cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIBAhpkTGlhYmlsaXR5IGFuZCB3YXJy
YW50aWVzIGFyZSBsaW1pdGVkISBTZWUgc2VjdGlvbiAiTGVnYWwgYW5kIExpbWl0YXRpb25z
IiBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LjA2BgNVHR8ELzAtMCugKaAnhiVodHRwOi8v
Y3JsLnN0YXJ0c3NsLmNvbS9jcnR1MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9jbGllbnQvY2Ew
QgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5jbGFzczEu
Y2xpZW50LmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJ
KoZIhvcNAQEFBQADggEBABxZ8Kfg6VHNLqpDTDn2fO7CP58DugjeaVk484YyyZaBoVfKibuW
OR77F3Z88Z3NjUy8f2jpeqPkvzfB15ymju+NdJMFqU21ry+xjTs3Nj6BGdOmyJ1wAc8gbvVI
BfDM/1s3ETtq1JTniEAU7cSxWWRczSm+6adDOooJITo1hM06TM9VcKhZeDHh9Ja/5RahoDU0
f2+u3NDBniY9HYf9dI/zYvhec91cQWMNIXUkF74yzGVIP34BlAcTVrHRf3arNeIzYoebHKkQ
0FSaSklALkEwuwPbWQDubg1GZOujg57Vsy75bgzEwrH7SQtNy2hWXbh7CnKRscSF5YVsJY3H
/5IxggPQMIIDzAIBATCBlDCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0
ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNV
BAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENBAgMC
0CAwCQYFKw4DAhoFAKCCAhAwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0B
CQUxDxcNMTIwNTI4MTY0MjMxWjAjBgkqhkiG9w0BCQQxFgQUxbbvMolHjaubQvjT9EZxIYXA
e7cwXwYJKoZIhvcNAQkPMVIwUDALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcN
AwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMIGlBgkrBgEE
AYI3EAQxgZcwgZQwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSsw
KQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9T
dGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQQIDAtAgMIGn
BgsqhkiG9w0BCRACCzGBl6CBlDCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29t
IEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2
BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENB
AgMC0CAwDQYJKoZIhvcNAQEBBQAEggEANTRrIo19GqrQM54bdD3Ls1L1EXaUeHoEmcCFEtMC
yvZlvXFGI3f7aTHWKSHsOAeUij+jP9XCx/jnF5tzGDNSRMOIY4Xe+OvVGTA6wGSX3phgptp0
YkgD0Z3MjD3MHmYDigvLsGz9kW8B57ZBaVKo3atTOUcVe/IB0l/xVJfkXHX0p8pQW9YQUQzx
ORteXARFr5kLSkfLWc6hWUifWj6DwV63ZJezus8tLquU/PLwp0ZvQz2+T4QAiCQUBejzl23F
6wFHp01QaLiuCCZDIiikVHul7/qzP+bLwUAlSamLk/dY9CTTzRwB8y050NfetO5ifOZFSqEb
F3iHPsEFNZz3aQAAAAAAAA==
--------------ms020000080303040501010802--


From MAILER-DAEMON Mon May 28 22:25:07 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SZC7P-0004i6-1E
	for mharc-bug-diffutils@gnu.org; Mon, 28 May 2012 22:25:07 -0400
Received: from eggs.gnu.org ([208.118.235.92]:43108)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SZC7L-0004Zv-VJ
	for bug-diffutils@gnu.org; Mon, 28 May 2012 22:25:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SZC7K-0001h2-5b
	for bug-diffutils@gnu.org; Mon, 28 May 2012 22:25:03 -0400
Received: from smtp.cs.ucla.edu ([131.179.128.62]:35304)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SZC7K-0001ZT-0c
	for bug-diffutils@gnu.org; Mon, 28 May 2012 22:25:02 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp.cs.ucla.edu (Postfix) with ESMTP id 83384A6001C;
	Mon, 28 May 2012 19:24:18 -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 h-Fu0MZf4fgI; Mon, 28 May 2012 19:24:18 -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 EF4FA39E800B;
	Mon, 28 May 2012 19:24:17 -0700 (PDT)
Message-ID: <4FC43347.8040002@cs.ucla.edu>
Date: Mon, 28 May 2012 19:24:07 -0700
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
User-Agent: Mozilla/5.0 (X11; Linux i686;
	rv:12.0) Gecko/20120430 Thunderbird/12.0.1
MIME-Version: 1.0
To: Tim Roes <mail@timroes.de>
References: <4FC3AAF7.9010405@timroes.de>
In-Reply-To: <4FC3AAF7.9010405@timroes.de>
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] time complexity of diff3
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: Tue, 29 May 2012 02:25:05 -0000

On 05/28/2012 09:42 AM, Tim Roes wrote:
> The algorithm as it is described in [1] seems to have O(n^3).

I don't see why.  I'd guess diff3 is O(n**2) but have
not done an analysis.


From MAILER-DAEMON Tue May 29 04:32:21 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SZHqn-0003hg-Ml
	for mharc-bug-diffutils@gnu.org; Tue, 29 May 2012 04:32:21 -0400
Received: from eggs.gnu.org ([208.118.235.92]:38736)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@timroes.de>) id 1SZHqg-0003g0-23
	for bug-diffutils@gnu.org; Tue, 29 May 2012 04:32:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mail@timroes.de>) id 1SZHqZ-00021k-1M
	for bug-diffutils@gnu.org; Tue, 29 May 2012 04:32:13 -0400
Received: from wrs-host-01.werosys.de ([78.46.110.70]:36562)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@timroes.de>) id 1SZHqY-00021T-Kp
	for bug-diffutils@gnu.org; Tue, 29 May 2012 04:32:06 -0400
Received: from [192.168.1.42] (dslb-188-099-242-132.pools.arcor-ip.net
	[188.99.242.132]) (using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by wrs-host-01.werosys.de (Postfix) with ESMTPSA id AC56AB958BE
	for <bug-diffutils@gnu.org>; Tue, 29 May 2012 10:32:02 +0200 (CEST)
Message-ID: <4FC48982.9060003@timroes.de>
Date: Tue, 29 May 2012 10:32:02 +0200
From: Tim Roes <mail@timroes.de>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20120216 Icedove/8.0
MIME-Version: 1.0
To: bug-diffutils@gnu.org
References: <4FC3AAF7.9010405@timroes.de> <4FC43347.8040002@cs.ucla.edu>
In-Reply-To: <4FC43347.8040002@cs.ucla.edu>
Content-Type: multipart/signed; protocol="application/pkcs7-signature";
	micalg=sha1; boundary="------------ms010109090204050608090909"
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 78.46.110.70
Subject: Re: [bug-diffutils] time complexity of diff3
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: Tue, 29 May 2012 08:32:20 -0000

This is a cryptographically signed message in MIME format.

--------------ms010109090204050608090909
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable

On 05/29/2012 04:24 AM, Paul Eggert wrote:
> I don't see why. I'd guess diff3 is O(n**2) but have not done an=20
> analysis.=20

That seems also more reasonable to me. I am writing a paper explaining=20
diff3 in every step
for university at the moment based on the mentioned paper. I changed=20
some ways, how
I describe the algorithm and ended up with O(n^2), but I am pretty sure=20
the original paper
has O(n^3) [so I might be still mistaken]. I guess O(n^2) is then the=20
real complexity of
the algorithm.

And just another small question, if you would be so kind to help me=20
there :-)
The man page of diff3 states out that it is written by Randy Smith. In=20
the repository
there is none commit by a person with that name, but you commited quite=20
much.
Did you commit some work for him?

Thanks for you help, again,
Tim

--=20
Tim Roes
Herrmann-Leichtlin-Str. 30
D-76185 Karlsruhe

www.timroes.de



--------------ms010109090204050608090909
Content-Type: application/pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"
Content-Description: S/MIME Cryptographic Signature

MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINTjCC
BjQwggQcoAMCAQICAR4wDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT
DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp
Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3
MTAyNDIxMDE1NVoXDTE3MTAyNDIxMDE1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T
dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu
aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs
aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcJg8zOLdgasSmkLhOr
lr6KMoOMpohBllVHrdRvEg/q6r8jR+EK75xCGhR8ToREoqe7zM9/UnC6TS2y9UKTpT1v7RSM
zR0t6ndl0TWBuUr/UXBhPk+Kmy7bI4yW4urC+y7P3/1/X7U8ocb8VpH/Clt+4iq7nirMcNh6
qJR+xjOhV+VHzQMALuGYn5KZmc1NbJQYclsGkDxDz2UbFqE2+6vIZoL+jb9x4Pa5gNf1TwSD
kOkikZB1xtB4ZqtXThaABSONdfmv/Z1pua3FYxnCFmdr/+N2JLKutIxMYqQOJebr/f/h5t95
m4JgrM3Y/w7YX9d7YAL9jvN4SydHsU6n65cCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB
Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRTcu2SnODaywFcfH6WNU7y1LhRgjAfBgNV
HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH
MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3
dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu
c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v
c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0
dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93
d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBAAqD
CH14qywGXLhjjF6uHLkjd02hcdh9hrw+VUsv+q1eeQWB21jWj3kJ96AUlPCoEGZ/ynJNScWy
6QMVQjbbMXltUfO4n4bGGdKo3awPWp61tjAFgraLJgDk+DsSvUD6EowjMTNx25GQgyYJ5RPI
zKKR9tQW8gGK+2+RHxkUCTbYFnL6kl8Ch507rUdPPipJ9CgJFws3kDS3gOS5WFMxcjO5DwKf
KSETEPrHh7p5shuuNktvsv6hxHTLhiMKX893gxdT3XLS9OKmCv87vkINQcNEcIIoFWbP9HOR
z9v3vQwR4e3ksLc2JZOAFK+ssS5XMEoznzpihEP0PLc4dCBYjbvSD7kxgDwZ+Aj8Q9PkbvE9
sIPP7ON0fz095HdThKjiVJe6vofq+n6b1NBc8XdrQvBmunwxD5nvtTW4vtN6VY7mUCmxsCie
uoBJ9OlqmsVWQvifIYf40dJPZkk9YgGTzWLpXDSfLSplbY2LL9C9U0ptvjcDjefLTvqSFc7t
w1sEhF0n/qpA2r0GpvkLRDmcSwVyPvmjFBGqUp/pNy8ZuPGQmHwFi2/14+xeSUDG2bwnsYJQ
G2EdJCB6luQ57GEnTA/yKZSTKI8dDQa8Sd3zfXb19mOgSF0bBdXbuKhEpuP9wirslFe6fQ1t
5j5R0xi72MZ8ikMu1RQZKCyDbMwazlHiMIIHEjCCBfqgAwIBAgIDAtAgMA0GCSqGSIb3DQEB
BQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20g
Q2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EwHhcNMTEwODA1MDA1OTMz
WhcNMTIwODA1MDY1NzExWjBcMSAwHgYDVQQNExc0Nzg2ODktMjV5eGVjeTBkMEZ5NDVXYTEY
MBYGA1UEAwwPbWFpbEB0aW1yb2VzLmRlMR4wHAYJKoZIhvcNAQkBFg9tYWlsQHRpbXJvZXMu
ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY9zOr028TvXpFJ/H/rW4mRqJk
hm2PnG7v+o6G3KaTBQIrJCHQWgP7HED6sWxsQ6DY3NWPlaGcT7PFjgYDXFmRIeei6BMDTQoM
mWHTALVD9V6nuBXN9qHn+9DYYGtnCAEkcf3TnGH4v4do+zwE3SrmgR8pZz+8GLqLFbztccv2
OpjR6unCPKO7bgIghNhwmYnM3d1DROrXCGwQaNSlxigcglqA0zAfXFIvxy6+1bhpG7YuQuhY
SnnkZEsLGF4KOsdYafUHJG/oqktVDXh+ky7tT9IwuapBizn1c8uTKw3gLm0RlfReWScJqfGz
5qPYjtxOEIst10rGqBDwoeBCbiZtAgMBAAGjggOqMIIDpjAJBgNVHRMEAjAAMAsGA1UdDwQE
AwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFICe+lQf4MTu
MyJyLIXAuBr+3jKAMB8GA1UdIwQYMBaAFFNy7ZKc4NrLAVx8fpY1TvLUuFGCMBoGA1UdEQQT
MBGBD21haWxAdGltcm9lcy5kZTCCAiEGA1UdIASCAhgwggIUMIICEAYLKwYBBAGBtTcBAgIw
ggH/MC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMDQG
CCsGAQUFBwIBFihodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9pbnRlcm1lZGlhdGUucGRmMIH3
BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEB
GoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3Mg
MSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCBy
ZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9m
IHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjCBnAYIKwYBBQUHAgIwgY8wJxYgU3Rh
cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIBAhpkTGlhYmlsaXR5IGFuZCB3YXJy
YW50aWVzIGFyZSBsaW1pdGVkISBTZWUgc2VjdGlvbiAiTGVnYWwgYW5kIExpbWl0YXRpb25z
IiBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LjA2BgNVHR8ELzAtMCugKaAnhiVodHRwOi8v
Y3JsLnN0YXJ0c3NsLmNvbS9jcnR1MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9jbGllbnQvY2Ew
QgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5jbGFzczEu
Y2xpZW50LmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJ
KoZIhvcNAQEFBQADggEBABxZ8Kfg6VHNLqpDTDn2fO7CP58DugjeaVk484YyyZaBoVfKibuW
OR77F3Z88Z3NjUy8f2jpeqPkvzfB15ymju+NdJMFqU21ry+xjTs3Nj6BGdOmyJ1wAc8gbvVI
BfDM/1s3ETtq1JTniEAU7cSxWWRczSm+6adDOooJITo1hM06TM9VcKhZeDHh9Ja/5RahoDU0
f2+u3NDBniY9HYf9dI/zYvhec91cQWMNIXUkF74yzGVIP34BlAcTVrHRf3arNeIzYoebHKkQ
0FSaSklALkEwuwPbWQDubg1GZOujg57Vsy75bgzEwrH7SQtNy2hWXbh7CnKRscSF5YVsJY3H
/5IxggPQMIIDzAIBATCBlDCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0
ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNV
BAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENBAgMC
0CAwCQYFKw4DAhoFAKCCAhAwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0B
CQUxDxcNMTIwNTI5MDgzMjAyWjAjBgkqhkiG9w0BCQQxFgQU58jYuLIs55T2CFzq6qgaMln6
LfkwXwYJKoZIhvcNAQkPMVIwUDALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcN
AwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMIGlBgkrBgEE
AYI3EAQxgZcwgZQwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSsw
KQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9T
dGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQQIDAtAgMIGn
BgsqhkiG9w0BCRACCzGBl6CBlDCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29t
IEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2
BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENB
AgMC0CAwDQYJKoZIhvcNAQEBBQAEggEAcZukh1C3I5fXWn2XcGpeq7JyrO4Z8Dn9fvY1Xxi/
cwJx4VkIQMKr0Lq9i47MTYRmBj+MH2BHIsAmYQzoyjjjoFrM2rY3iv2dJP1jxrEfDTGG6UWd
FDM3LT0AdiOiKOjmcpXEpttt87YNg6x9M7CTVm5H/1T888j6tiUr3rII+Sgdmg/Q2Yz2jzFS
j8RJA0idNGXrWGggSWxtD3Y4rYnqAq8dktFTjDzpbRbHBDnu94OTJZcNG0GXsS9z4hDPujjs
qoxeGZkxvkzpLQvDiB0nQJMWCgBH2SH/UxujrXHLW18POKQMfs/CCPfLv7KLhF5IUrzzenyv
8SqZHP3qCZ2/WAAAAAAAAA==
--------------ms010109090204050608090909--


From MAILER-DAEMON Tue May 29 11:40:37 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1SZOXF-0000Un-Lj
	for mharc-bug-diffutils@gnu.org; Tue, 29 May 2012 11:40:37 -0400
Received: from eggs.gnu.org ([208.118.235.92]:41425)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SZOX8-0000Uf-8a
	for bug-diffutils@gnu.org; Tue, 29 May 2012 11:40:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SZOX6-0002qo-KB
	for bug-diffutils@gnu.org; Tue, 29 May 2012 11:40:29 -0400
Received: from smtp.cs.ucla.edu ([131.179.128.62]:55450)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1SZOX6-0002pr-EV
	for bug-diffutils@gnu.org; Tue, 29 May 2012 11:40:28 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp.cs.ucla.edu (Postfix) with ESMTP id 671E8A60023;
	Tue, 29 May 2012 08:40:25 -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 WGQanM0QQN+J; Tue, 29 May 2012 08:40:25 -0700 (PDT)
Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200])
	by smtp.cs.ucla.edu (Postfix) with ESMTPSA id CBE2DA60024;
	Tue, 29 May 2012 08:40:24 -0700 (PDT)
Message-ID: <4FC4EDE8.7060209@cs.ucla.edu>
Date: Tue, 29 May 2012 08:40:24 -0700
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:12.0) Gecko/20120430 Thunderbird/12.0.1
MIME-Version: 1.0
To: Tim Roes <mail@timroes.de>
References: <4FC3AAF7.9010405@timroes.de> <4FC43347.8040002@cs.ucla.edu>
	<4FC48982.9060003@timroes.de>
In-Reply-To: <4FC48982.9060003@timroes.de>
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] time complexity of diff3
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: Tue, 29 May 2012 15:40:36 -0000

On 05/29/2012 01:32 AM, Tim Roes wrote:
> The man page of diff3 states out that it is written by Randy Smith. In the repository
> there is none commit by a person with that name, but you commited quite much.
> Did you commit some work for him?

Randy Smith wrote the original version.
I never committed his work (David MacKenzie did that).
Although a lot of the code is my work now, I haven't
changed the fundamental algorithm and have not bothered
to add myself to the AUTHORS variable.


From MAILER-DAEMON Thu May 31 05:13:57 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Sa1S9-0005WT-E2
	for mharc-bug-diffutils@gnu.org; Thu, 31 May 2012 05:13:57 -0400
Received: from eggs.gnu.org ([208.118.235.92]:38023)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1Sa1S4-0005Vp-Ax
	for bug-diffutils@gnu.org; Thu, 31 May 2012 05:13:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1Sa1S1-0002Z4-M1
	for bug-diffutils@gnu.org; Thu, 31 May 2012 05:13:51 -0400
Received: from mx.meyering.net ([88.168.87.75]:39465)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1Sa1S1-0002Yi-Eh
	for bug-diffutils@gnu.org; Thu, 31 May 2012 05:13:49 -0400
Received: from rho.meyering.net (localhost.localdomain [127.0.0.1])
	by rho.meyering.net (Acme Bit-Twister) with ESMTP id 08CB6600BC;
	Thu, 31 May 2012 11:13:48 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: Tim Roes <mail@timroes.de>
In-Reply-To: <4FC48982.9060003@timroes.de> (Tim Roes's message of "Tue, 29 May
	2012 10:32:02 +0200")
References: <4FC3AAF7.9010405@timroes.de> <4FC43347.8040002@cs.ucla.edu>
	<4FC48982.9060003@timroes.de>
Date: Thu, 31 May 2012 11:13:48 +0200
Message-ID: <87sjeg67cj.fsf@rho.meyering.net>
Lines: 22
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: 88.168.87.75
Cc: bug-diffutils@gnu.org
Subject: Re: [bug-diffutils] time complexity of diff3
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: Thu, 31 May 2012 09:13:56 -0000

Tim Roes wrote:
> On 05/29/2012 04:24 AM, Paul Eggert wrote:
>> I don't see why. I'd guess diff3 is O(n**2) but have not done an analysis.
>
> That seems also more reasonable to me. I am writing a paper explaining
> diff3 in every step
> for university at the moment based on the mentioned paper. I changed
> some ways, how
> I describe the algorithm and ended up with O(n^2), but I am pretty
> sure the original paper
> has O(n^3) [so I might be still mistaken]. I guess O(n^2) is then the
> real complexity of
> the algorithm.
>
> And just another small question, if you would be so kind to help me there :-)
> The man page of diff3 states out that it is written by Randy Smith. In
> the repository
> there is none commit by a person with that name, but you commited quite much.
> Did you commit some work for him?

Also note that the people doing the earliest work either did not
use version control or never told us how to find their repository.


