Bug#96085: marked as done (mgdiff has wrong heuristics for determining whether a file is text or not)
Your message dated Sat, 22 Sep 2001 15:03:33 -0400
with message-id <E15ks3p-0008Vb-00@auric.debian.org>
and subject line Bug#96085: fixed in mgdiff 1.0-13
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Darren Benham
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 2 May 2001 17:06:38 +0000
>From piefel@informatik.hu-berlin.de Wed May 02 12:06:38 2001
Return-path: <piefel@informatik.hu-berlin.de>
Received: from mail.informatik.hu-berlin.de [141.20.20.50]
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 14v05F-00062C-00; Wed, 02 May 2001 12:06:38 -0500
Received: from kosh.informatik.hu-berlin.de (mail@kosh [141.20.23.210])
by mail.informatik.hu-berlin.de (8.9.1/8.9.1/INF-2.0-MA-UNIX-4.0E) with ESMTP id TAA01681
for <submit@bugs.debian.org>; Wed, 2 May 2001 19:06:34 +0200 (MET DST)
Received: from piefel by kosh.informatik.hu-berlin.de with local (Exim 3.22 #1 (Debian))
id 14v05D-000374-00
for <submit@bugs.debian.org>; Wed, 02 May 2001 19:06:35 +0200
Date: Wed, 2 May 2001 19:06:35 +0200
From: Michael Piefel <piefel@debian.org>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: mgdiff has wrong heuristics for determining whether a file is text or not
Message-ID: <20010502190635.A11898@kosh.informatik.hu-berlin.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
User-Agent: Mutt/1.3.15i
X-Reportbug-Version: 1.15
Sender: Michael Piefel <piefel@informatik.hu-berlin.de>
Content-Transfer-Encoding: quoted-printable
X-MIME-Autoconverted: from 8bit to quoted-printable by mail.informatik.hu-berlin.de id TAA01681
Delivered-To: submit@bugs.debian.org
Package: mgdiff
Version: 1.0-12
Severity: important
mgdiff uses a heuristics for sanity checking whether it is handling text
files or not. But this heuristics is getting it wrong for any text that
is non-ascii. I would accept it if it were only a warning, but mgdiff
downright refuses to diff my files. This bug is in fact very old and
well known here, don't quite know why it hasn't been fixed. I guess
upstream development ceased. Actually, with the advent of vimdiff I
don't need mgdiff anymore, but anyway, here is a quick patch:
-----------------------------------------------------------------
diff silly/files.c serious/files.c
54c54
< static int is_ascii_text (char *filename);
---
> static int is_text (char *filename);
81,82c81,83
< /*=20
< * quick heuristic to test whether a file's contents are ascii text
---
> /*
> * quick heuristic to test whether a file's contents are text
> * MPi: too quick! changed to accept at least all of the latin-* stuff
84c85
< static int is_ascii_text (char *filename)
---
> static int is_text (char *filename)
86c87
< int fd, bytes, i;
---
> int fd, bytes, i, byte;
93,94c94,98
< for (i =3D 0; i < bytes; i++)
< if (!isascii (buffer[i]))
---
> for (i =3D 0; i < bytes; i++) {
> byte=3Dbuffer[i];
> if (!( isascii (byte) ||
> (160<=3Dbyte && byte<=3D255) ||
> (-96<=3Dbyte && byte<=3D-1) ))
95a100
> }
128c133
< if (!is_ascii_text (filename)) {
---
> if (!is_text (filename)) {
diff silly/patchlevel.h serious/patchlevel.h
36c36
< #define PATCHLEVEL "0"
---
> #define PATCHLEVEL "0-debian1"
-----------------------------------------------------------------
Also I'd like to know - is this package orphaned? It has debian-qa as
its maintainer, but it doesn't appear on the WNPP. If noone objects,
I'll take it, it doesn't look like a heavy burden. Oh wait, sorry, I see
an ITA, but it's from January...
-- System Information
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux kosh 2.4.0-ac7 #5 Mon Jan 22 09:11:26 CET 2001 i686
Versions of packages mgdiff depends on:
ii file 3.33-4 Determines file type using "=
magic"
ii lesstif1 1:0.92.26-1 OSF/Motif implementation rel=
eased=20
ii libc6 2.2.2-4 GNU C Library: Shared librar=
ies an
ii mawk 1.3.3-5 a pattern scanning and text =
proces
ii xlibs 4.0.2-13 X Window System client libra=
ries =20
--=20
|=3D| Michael Piefel piefel@informatik.hu-berlin.de
|=3D| Humboldt-Universit=E4t zu Berlin http://www.piefel.de
|=3D| Tel. (+49 30) 2093 3831
---------------------------------------
Received: (at 96085-close) by bugs.debian.org; 22 Sep 2001 19:13:28 +0000
>From troup@auric.debian.org Sat Sep 22 14:13:28 2001
Return-path: <troup@auric.debian.org>
Received: from auric.debian.org [206.246.226.45] (mail)
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 15ksDQ-0001Yp-00; Sat, 22 Sep 2001 14:13:28 -0500
Received: from troup by auric.debian.org with local (Exim 3.12 1 (Debian))
id 15ks3p-0008Vb-00; Sat, 22 Sep 2001 15:03:33 -0400
From: Peter Palfrader <weasel@debian.org>
To: 96085-close@bugs.debian.org
X-Katie: $Revision: 1.59 $
Subject: Bug#96085: fixed in mgdiff 1.0-13
Message-Id: <E15ks3p-0008Vb-00@auric.debian.org>
Sender: James Troup <troup@auric.debian.org>
Date: Sat, 22 Sep 2001 15:03:33 -0400
Delivered-To: 96085-close@bugs.debian.org
We believe that the bug you reported is fixed in the latest version of
mgdiff, which has been installed in the Debian FTP archive:
mgdiff_1.0-13.diff.gz
to pool/main/m/mgdiff/mgdiff_1.0-13.diff.gz
mgdiff_1.0-13.dsc
to pool/main/m/mgdiff/mgdiff_1.0-13.dsc
mgdiff_1.0-13_i386.deb
to pool/main/m/mgdiff/mgdiff_1.0-13_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 96085@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Peter Palfrader <weasel@debian.org> (supplier of updated mgdiff package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sat, 22 Sep 2001 15:42:00 +0200
Source: mgdiff
Binary: mgdiff
Architecture: source i386
Version: 1.0-13
Distribution: unstable
Urgency: low
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Peter Palfrader <weasel@debian.org>
Description:
mgdiff - xdiff clone
Closes: 96085
Changes:
mgdiff (1.0-13) unstable; urgency=low
.
* Debian QA Upload.
* Changed maintainer email address from debian-qa@lists.debian.org
to packages@qa.debian.org.
* New version built by Paul Serice <paul@serice.net>
Fri, 21 Sep 2001 01:29:06 -0500; Thanks Paul:
- Merged patch from Polish(ed) distribution, closes: #96085
(mgdiff has wrong heuristics for determining whether a file is
text or not).
- rmgdiff failed to escape meta-characters in directory names causing
directories like "c++_src" to trigger a sanity check.
Files:
09b7df44eaa6551f74bb3db336bc083e 613 text optional mgdiff_1.0-13.dsc
6155727f13bd1792275fd16976fc0568 19881 text optional mgdiff_1.0-13.diff.gz
d915ff06b7260f94d45fcc10d0d10913 44408 text optional mgdiff_1.0-13_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQE7rJV43nqvbpTAnH8RAupSAJ4rS2clq0soqrIHXBOaaQP9R5XL5wCeIqkj
g3FwSjGxA/lALeKQ8t9iRrQ=
=1JR8
-----END PGP SIGNATURE-----
Reply to: