From unknown Mon Sep 08 21:32:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#64461: strange output of "diff -l -y" Resent-From: Bruno Haible Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Tue, 04 Jul 2023 16:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64461 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 64461@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16884892342446 (code B ref -1); Tue, 04 Jul 2023 16:48:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jul 2023 16:47:14 +0000 Received: from localhost ([127.0.0.1]:36525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGjBJ-0000dO-Q5 for submit@debbugs.gnu.org; Tue, 04 Jul 2023 12:47:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:54468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGjBG-0000dF-PO for submit@debbugs.gnu.org; Tue, 04 Jul 2023 12:47:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGjBG-0004Uc-D2 for bug-diffutils@gnu.org; Tue, 04 Jul 2023 12:47:10 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.24]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGjBE-0003uN-7S for bug-diffutils@gnu.org; Tue, 04 Jul 2023 12:47:10 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1688489224; cv=none; d=strato.com; s=strato-dkim-0002; b=j8Hg4+1tCL1E9j1HT+gV/m6Y58C+BXcHf6EbN4Xuofd/aT+epeyAB++RfF2e5SsGYl wuIMAGZ0BU921SMlk0akfQuWUMZge1zK7vBH+bejWD0XkyXgEf0w882llQYBm767e01P NuC1zSkUngiKdaFwQlzlHuiLyjNG23KcBLh5lku7KBql9erjHfDNY2VhB52CZ0C/tb1c QCkXLjhEKq9FOn88BoHbChGWjFyKVkOJ8r4wwRuMnSuySIML1hZDaQ//GJOELqaRgQV4 133j0DSAElN68Ddcub2i2+Jd0Ve9QVVxsFDr0SwrAO1geF0IfdGLTrK+lLALNIIRPir+ ektA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1688489224; s=strato-dkim-0002; d=strato.com; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=87rKv063lTy2fB25FV1eVYpFMO9dsyzV0y8ROpxEvZo=; b=br9EPsHdDx+DuPZ2+7d6E2YoDeXsDL7st5X3HvYy2ehZHaIjh8Ei7yvXDiJTgGi2RB LOGruq2H0VGgcX4YHH4eBg/q4qnk1q3gv9zfL3r0voK5n8Fbg32oF64j+wM8irxuwQvF TxUvimQYIQM2kTvM2gXt+hZUvOnkZiiMPgWqZvOlnhL+N7z6OPJUAl/cT/C1xFTD3s6V /Gg2LMreN3OL7zSR1EGDvCK+lUrFJMCqDFB0Zy8RB9AVzVPZbgbA5Hd6W4uMi1oGuXPH /+tBJaKCra5NyFIHEnehy8nlbiKj9RoCIES0GYHhY5AbfXbZAo4Z4aKIJQRJuXTxDO3k orJQ== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1688489224; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=87rKv063lTy2fB25FV1eVYpFMO9dsyzV0y8ROpxEvZo=; b=cX2kDdpcmkPLkAYJAhULZbQGI+HTmaYCZhVRa+w6Kz7PACZQ1oAt+neRX5lAnSTiaB AgEKlE78rUuT8noKHGvPLHPftpD97uPfNkryogi52UfgVMhykRrUvIM5uPv464c+X5JA hEKLLDs5kF/QZNPCy2Vu5VAQKgbrYZ8CXMRnIs1GQm42oeM4hUdCEuzJqXxt4FgRFXO2 MyEayUzpAcbOkl3nBRS+6EemUkDxtzSxViDMebxmBHPS+B3NeORPE+hQF7Gfg7u8INHo MXCb1ATZ0tw2+gLmCTkLS/bjXLik0hJfCbY3owplUVL4Iw3kLVXfgvyersOZupUXp2FZ K2Rg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1688489224; s=strato-dkim-0003; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=87rKv063lTy2fB25FV1eVYpFMO9dsyzV0y8ROpxEvZo=; b=gKPXNQ1oeJO/gKwxtbYZUEpiuagFxDez9+keU2MU7t2wYwRSmFnjkr9TAiLsTLocYf aic8TqrLj7dwpKjQKBCw== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH0WWb0LN8XZoH94zq68+3cfpOVjqcd4JZPL1UbpJj1jhHvxIyucA==" Received: from nimes.localnet by smtp.strato.de (RZmta 49.6.0 AUTH) with ESMTPSA id 6b0accz64Gl4ekb (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 4 Jul 2023 18:47:04 +0200 (CEST) From: Bruno Haible Date: Tue, 04 Jul 2023 18:47:04 +0200 Message-ID: <3006823.687JKscXgg@nimes> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart2328136.BjyWNHgNrj" Content-Transfer-Encoding: 7Bit Received-SPF: none client-ip=85.215.255.24; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This is a multi-part message in MIME format. --nextPart2328136.BjyWNHgNrj Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="UTF-8" SGksCgpTZWVuIHdpdGggZGlmZnV0aWxzICdtYXN0ZXInIGJyYW5jaCB0b2RheToKCiQgY2F0IGZv bzEudHh0CuS9oOWlvQokIGNhdCBmb28yLnR4dArml6nmmagsIOS9oOWlvQokIHNyYy9kaWZmIC15 IGZvbzEudHh0IGZvbzIudHh0CuS9oOWlvSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB8IOaXqeaZqCwg5L2g5aW9CiQgc3JjL2RpZmYgLWwg LXkgZm9vMS50eHQgZm9vMi50eHQKCgoyMDIzLTA3LTA0IDE4OjQxICAgICAgICAgICBkaWZmIC1s IC15IGZvbzEudHh0IGZvbzIudHh0ICAgICAgICAgICBQYWdlIDEKCgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgLCAKCgoKCgoK CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK5L2g 5aW95pep5pmo5L2g5aW9CgooYW5kIHRoZSBsYXN0IGxpbmUgaXMgbm90IHRlcm1pbmF0ZWQgYnkg YSBuZXdsaW5lKS4KClRoaXMgaXMgc3RyYW5nZSwgaXNuJ3QgaXQ/ICdkaWZmJyBoYXMgc2VwYXJh dGUgdGhlIEFTQ0lJIGZyb20gdGhlCm5vbi1BU0NJSSBwYXJ0cyBvZiB0aGUgaW5wdXQuIFdpdGgg dGhlIGF0dGFjaGVkIHBhdGNoLCB0aGUgb3V0cHV0IGJlY29tZXM6CgokIHNyYy9kaWZmIC1sIC15 IGZvbzEudHh0IGZvbzIudHh0CgoKMjAyMy0wNy0wNCAxODo0MiAgICAgICAgICAgZGlmZiAtbCAt eSBmb28xLnR4dCBmb28yLnR4dCAgICAgICAgICAgUGFnZSAxCgoK5L2g5aW9ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwg5pep5pmoLCDk vaDlpb0KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK CgoKCgoKCgoKCih3aGljaCBpcyBtb3JlIHdoYXQgSSBoYWQgZXhwZWN0ZWQpLgoK --nextPart2328136.BjyWNHgNrj Content-Disposition: attachment; filename="0001-diff-Fix-output-of-diff-l-y-for-non-ASCII-input-file.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0001-diff-Fix-output-of-diff-l-y-for-non-ASCII-input-file.patch" >From cb52fa88d5f2d9bc4894a7eccd90fdc2e03f5af4 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 4 Jul 2023 18:45:33 +0200 Subject: [PATCH] diff: Fix output of "diff -l -y" for non-ASCII input files * src/side.c (print_half_line): Output the multibyte character to out, not stdout. --- src/side.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/side.c b/src/side.c index 2f566f8..46ef095 100644 --- a/src/side.c +++ b/src/side.c @@ -146,7 +146,7 @@ print_half_line (char const *const *line, intmax_t indent, intmax_t out_bound) if (in_position <= out_bound) { out_position = in_position; - fwrite (tp0, 1, bytes, stdout); + fwrite (tp0, 1, bytes, out); } text_pointer = tp0 + bytes; break; -- 2.34.1 --nextPart2328136.BjyWNHgNrj-- From unknown Mon Sep 08 21:32:40 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Bruno Haible Subject: bug#64461: closed (Re: [bug-diffutils] bug#64461: strange output of "diff -l -y") Message-ID: References: <3006823.687JKscXgg@nimes> X-Gnu-PR-Message: they-closed 64461 X-Gnu-PR-Package: diffutils Reply-To: 64461@debbugs.gnu.org Date: Tue, 04 Jul 2023 17:48:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1688492882-9322-1" This is a multi-part message in MIME format... ------------=_1688492882-9322-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #64461: strange output of "diff -l -y" which was filed against the diffutils package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 64461@debbugs.gnu.org. --=20 64461: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64461 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1688492882-9322-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 64461-done) by debbugs.gnu.org; 4 Jul 2023 17:47:48 +0000 Received: from localhost ([127.0.0.1]:36586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGk7w-0002Om-DT for submit@debbugs.gnu.org; Tue, 04 Jul 2023 13:47:48 -0400 Received: from mail.cs.ucla.edu ([131.179.128.66]:47532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGk7r-0002Ni-Lj for 64461-done@debbugs.gnu.org; Tue, 04 Jul 2023 13:47:46 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 884FC3C011BD8; Tue, 4 Jul 2023 10:47:37 -0700 (PDT) Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id iqunCeKcW56r; Tue, 4 Jul 2023 10:47:37 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 300CE3C011BD9; Tue, 4 Jul 2023 10:47:37 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 300CE3C011BD9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1688492857; bh=11Mct0XbkcWIYo3i2h6yXE0rrI7OJTI+PGsExOI25Q0=; h=Message-ID:Date:MIME-Version:To:From; b=IrkdvTYreEVJF+cw2rS/0d3oSHz0B9s4BLBUTpZUCGrqhXhrr/zVCyIJfYWRnMNxr eGPaRM3nsNpmuBdBXlyiLMl3PbRuC7z7cJGUe5qcNcnEDv3xdf5uutOkGBA1Tzxjod BEAk+deUXEMXMGDv2RygTwSyNJucxMEqpN+mVNXZmrwUN5QsGo/69bhyW7FAooTyi3 K/cfnhMJ3/3LUIzi9AUFthBWRD2ykOCWT1HOI7+9kPuk1mkI2QEe3YIub2WtVcOw28 QfsUVBO2FZrYd7O2SdHlRvecT1IS92LvCGLw3K2QHiiaskUSe2dgo6U2E1viyzR6W4 WNi9jXT1HA6EQ== X-Virus-Scanned: amavisd-new at mail.cs.ucla.edu Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id W4eVrMnVIpoP; Tue, 4 Jul 2023 10:47:37 -0700 (PDT) Received: from [192.168.1.9] (cpe-172-91-119-151.socal.res.rr.com [172.91.119.151]) by mail.cs.ucla.edu (Postfix) with ESMTPSA id 0D9473C011BD8; Tue, 4 Jul 2023 10:47:37 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------gpdj8FoMLQ8dsleYpLuUjoBh" Message-ID: Date: Tue, 4 Jul 2023 10:47:35 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [bug-diffutils] bug#64461: strange output of "diff -l -y" To: Bruno Haible References: <3006823.687JKscXgg@nimes> Content-Language: en-US From: Paul Eggert Organization: UCLA Computer Science Department In-Reply-To: <3006823.687JKscXgg@nimes> X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: 64461-done Cc: 64461-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) This is a multi-part message in MIME format. --------------gpdj8FoMLQ8dsleYpLuUjoBh Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Thanks, I installed that, followed by the attached NEWS update. Luckily nobody uses diff -ly. --------------gpdj8FoMLQ8dsleYpLuUjoBh Content-Type: text/x-patch; charset=UTF-8; name="0001-doc-mention-bug-64461-in-NEWS.patch" Content-Disposition: attachment; filename="0001-doc-mention-bug-64461-in-NEWS.patch" Content-Transfer-Encoding: base64 RnJvbSA4NDc0YjZlMDg4NjI3YjRiMjE2NzIzNzRjYzYzY2YyZDI2Y2I4ZWRhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUdWUsIDQgSnVsIDIwMjMgMTA6NDM6MDkgLTA3MDAKU3ViamVjdDogW1BBVENI XSBkb2M6IG1lbnRpb24gYnVnIzY0NDYxIGluIE5FV1MKCi0tLQogTkVXUyB8IDMgKysrCiAx IGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvTkVXUyBiL05F V1MKaW5kZXggMDA1OTQxNS4uZjkzMTk2ZCAxMDA2NDQKLS0tIGEvTkVXUworKysgYi9ORVdT CkBAIC0xOSw2ICsxOSw5IEBAIEdOVSBkaWZmdXRpbHMgTkVXUyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIC0qLSBvdXRsaW5lIC0qLQogICAgIGNwIC9wcm9jL2NtZGxp bmUgdDsgY21wIC1zIC9wcm9jL2NtZGxpbmUgdCB8fCBlY2hvIGZpbGVzIGRpZmZlcgogICBb YnVnIHByZXNlbnQgc2luY2UgInRoZSBiZWdpbm5pbmciXQogCisgIGRpZmYgLWx5IG5vIGxv bmdlciBtaXNoYW5kbGVzIG5vbi1BU0NJSSBpbnB1dAorICBbYnVnIzY0NDYxIGludHJvZHVj ZWQgaW4gMi45XQorCiAKICogTm90ZXdvcnRoeSBjaGFuZ2VzIGluIHJlbGVhc2UgMy4xMCAo MjAyMy0wNS0yMSkgW3N0YWJsZV0KIAotLSAKMi4zOS4yCgo= --------------gpdj8FoMLQ8dsleYpLuUjoBh-- ------------=_1688492882-9322-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Jul 2023 16:47:14 +0000 Received: from localhost ([127.0.0.1]:36525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGjBJ-0000dO-Q5 for submit@debbugs.gnu.org; Tue, 04 Jul 2023 12:47:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:54468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGjBG-0000dF-PO for submit@debbugs.gnu.org; Tue, 04 Jul 2023 12:47:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGjBG-0004Uc-D2 for bug-diffutils@gnu.org; Tue, 04 Jul 2023 12:47:10 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.24]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGjBE-0003uN-7S for bug-diffutils@gnu.org; Tue, 04 Jul 2023 12:47:10 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1688489224; cv=none; d=strato.com; s=strato-dkim-0002; b=j8Hg4+1tCL1E9j1HT+gV/m6Y58C+BXcHf6EbN4Xuofd/aT+epeyAB++RfF2e5SsGYl wuIMAGZ0BU921SMlk0akfQuWUMZge1zK7vBH+bejWD0XkyXgEf0w882llQYBm767e01P NuC1zSkUngiKdaFwQlzlHuiLyjNG23KcBLh5lku7KBql9erjHfDNY2VhB52CZ0C/tb1c QCkXLjhEKq9FOn88BoHbChGWjFyKVkOJ8r4wwRuMnSuySIML1hZDaQ//GJOELqaRgQV4 133j0DSAElN68Ddcub2i2+Jd0Ve9QVVxsFDr0SwrAO1geF0IfdGLTrK+lLALNIIRPir+ ektA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1688489224; s=strato-dkim-0002; d=strato.com; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=87rKv063lTy2fB25FV1eVYpFMO9dsyzV0y8ROpxEvZo=; b=br9EPsHdDx+DuPZ2+7d6E2YoDeXsDL7st5X3HvYy2ehZHaIjh8Ei7yvXDiJTgGi2RB LOGruq2H0VGgcX4YHH4eBg/q4qnk1q3gv9zfL3r0voK5n8Fbg32oF64j+wM8irxuwQvF TxUvimQYIQM2kTvM2gXt+hZUvOnkZiiMPgWqZvOlnhL+N7z6OPJUAl/cT/C1xFTD3s6V /Gg2LMreN3OL7zSR1EGDvCK+lUrFJMCqDFB0Zy8RB9AVzVPZbgbA5Hd6W4uMi1oGuXPH /+tBJaKCra5NyFIHEnehy8nlbiKj9RoCIES0GYHhY5AbfXbZAo4Z4aKIJQRJuXTxDO3k orJQ== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1688489224; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=87rKv063lTy2fB25FV1eVYpFMO9dsyzV0y8ROpxEvZo=; b=cX2kDdpcmkPLkAYJAhULZbQGI+HTmaYCZhVRa+w6Kz7PACZQ1oAt+neRX5lAnSTiaB AgEKlE78rUuT8noKHGvPLHPftpD97uPfNkryogi52UfgVMhykRrUvIM5uPv464c+X5JA hEKLLDs5kF/QZNPCy2Vu5VAQKgbrYZ8CXMRnIs1GQm42oeM4hUdCEuzJqXxt4FgRFXO2 MyEayUzpAcbOkl3nBRS+6EemUkDxtzSxViDMebxmBHPS+B3NeORPE+hQF7Gfg7u8INHo MXCb1ATZ0tw2+gLmCTkLS/bjXLik0hJfCbY3owplUVL4Iw3kLVXfgvyersOZupUXp2FZ K2Rg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1688489224; s=strato-dkim-0003; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=87rKv063lTy2fB25FV1eVYpFMO9dsyzV0y8ROpxEvZo=; b=gKPXNQ1oeJO/gKwxtbYZUEpiuagFxDez9+keU2MU7t2wYwRSmFnjkr9TAiLsTLocYf aic8TqrLj7dwpKjQKBCw== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH0WWb0LN8XZoH94zq68+3cfpOVjqcd4JZPL1UbpJj1jhHvxIyucA==" Received: from nimes.localnet by smtp.strato.de (RZmta 49.6.0 AUTH) with ESMTPSA id 6b0accz64Gl4ekb (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 4 Jul 2023 18:47:04 +0200 (CEST) From: Bruno Haible To: bug-diffutils@gnu.org Subject: strange output of "diff -l -y" Date: Tue, 04 Jul 2023 18:47:04 +0200 Message-ID: <3006823.687JKscXgg@nimes> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart2328136.BjyWNHgNrj" Content-Transfer-Encoding: 7Bit Received-SPF: none client-ip=85.215.255.24; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This is a multi-part message in MIME format. --nextPart2328136.BjyWNHgNrj Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="UTF-8" SGksCgpTZWVuIHdpdGggZGlmZnV0aWxzICdtYXN0ZXInIGJyYW5jaCB0b2RheToKCiQgY2F0IGZv bzEudHh0CuS9oOWlvQokIGNhdCBmb28yLnR4dArml6nmmagsIOS9oOWlvQokIHNyYy9kaWZmIC15 IGZvbzEudHh0IGZvbzIudHh0CuS9oOWlvSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB8IOaXqeaZqCwg5L2g5aW9CiQgc3JjL2RpZmYgLWwg LXkgZm9vMS50eHQgZm9vMi50eHQKCgoyMDIzLTA3LTA0IDE4OjQxICAgICAgICAgICBkaWZmIC1s IC15IGZvbzEudHh0IGZvbzIudHh0ICAgICAgICAgICBQYWdlIDEKCgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgLCAKCgoKCgoK CgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK5L2g 5aW95pep5pmo5L2g5aW9CgooYW5kIHRoZSBsYXN0IGxpbmUgaXMgbm90IHRlcm1pbmF0ZWQgYnkg YSBuZXdsaW5lKS4KClRoaXMgaXMgc3RyYW5nZSwgaXNuJ3QgaXQ/ICdkaWZmJyBoYXMgc2VwYXJh dGUgdGhlIEFTQ0lJIGZyb20gdGhlCm5vbi1BU0NJSSBwYXJ0cyBvZiB0aGUgaW5wdXQuIFdpdGgg dGhlIGF0dGFjaGVkIHBhdGNoLCB0aGUgb3V0cHV0IGJlY29tZXM6CgokIHNyYy9kaWZmIC1sIC15 IGZvbzEudHh0IGZvbzIudHh0CgoKMjAyMy0wNy0wNCAxODo0MiAgICAgICAgICAgZGlmZiAtbCAt eSBmb28xLnR4dCBmb28yLnR4dCAgICAgICAgICAgUGFnZSAxCgoK5L2g5aW9ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwg5pep5pmoLCDk vaDlpb0KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoK CgoKCgoKCgoKCih3aGljaCBpcyBtb3JlIHdoYXQgSSBoYWQgZXhwZWN0ZWQpLgoK --nextPart2328136.BjyWNHgNrj Content-Disposition: attachment; filename="0001-diff-Fix-output-of-diff-l-y-for-non-ASCII-input-file.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0001-diff-Fix-output-of-diff-l-y-for-non-ASCII-input-file.patch" >From cb52fa88d5f2d9bc4894a7eccd90fdc2e03f5af4 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 4 Jul 2023 18:45:33 +0200 Subject: [PATCH] diff: Fix output of "diff -l -y" for non-ASCII input files * src/side.c (print_half_line): Output the multibyte character to out, not stdout. --- src/side.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/side.c b/src/side.c index 2f566f8..46ef095 100644 --- a/src/side.c +++ b/src/side.c @@ -146,7 +146,7 @@ print_half_line (char const *const *line, intmax_t indent, intmax_t out_bound) if (in_position <= out_bound) { out_position = in_position; - fwrite (tp0, 1, bytes, stdout); + fwrite (tp0, 1, bytes, out); } text_pointer = tp0 + bytes; break; -- 2.34.1 --nextPart2328136.BjyWNHgNrj-- ------------=_1688492882-9322-1--