From unknown Sat Jun 14 19:44:57 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66095: diff quoting for names with spaces changed after v3.10-171-g69ae797392 Resent-From: Gleb Fotengauer-Malinovskiy Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Mon, 18 Sep 2023 22:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66095 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 66095@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169507518113950 (code B ref -1); Mon, 18 Sep 2023 22:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 22:13:01 +0000 Received: from localhost ([127.0.0.1]:54860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiMUG-0003cs-Gk for submit@debbugs.gnu.org; Mon, 18 Sep 2023 18:13:01 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiLNE-0007OM-Hn for submit@debbugs.gnu.org; Mon, 18 Sep 2023 17:01:41 -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 1qiLMr-0003Ul-Am for bug-diffutils@gnu.org; Mon, 18 Sep 2023 17:01:18 -0400 Received: from vmicros1.altlinux.org ([194.107.17.57]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiLMp-0005mW-2U for bug-diffutils@gnu.org; Mon, 18 Sep 2023 17:01:17 -0400 Received: from imap.altlinux.org (imap.altlinux.org [194.107.17.38]) by vmicros1.altlinux.org (Postfix) with ESMTP id 1045472C8EB for ; Tue, 19 Sep 2023 00:01:11 +0300 (MSK) Received: from glebfm.altlinux.org (flight.tilaa.cloud [84.22.108.118]) by imap.altlinux.org (Postfix) with ESMTPSA id DF92136D0174 for ; Tue, 19 Sep 2023 00:01:10 +0300 (MSK) Date: Tue, 19 Sep 2023 01:00:52 +0400 From: Gleb Fotengauer-Malinovskiy Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=194.107.17.57; envelope-from=glebfm@altlinux.org; helo=vmicros1.altlinux.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Mailman-Approved-At: Mon, 18 Sep 2023 18:12:58 -0400 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: -0.1 (/) Hi, Following the commit v3.10-171-g69ae797392 ("cmp,diff,diff3,sdiff: quote more consistently") the quoting changed as follows: $ diff --version | head -1 diff (GNU diffutils) 3.10.171-69ae7 $ diff -u with\ space/1 with\ space/2 --- 'with space/1' 1970-01-01 00:00:00.000000000 +0000 +++ 'with space/2' 1970-01-01 00:00:00.000000000 +0000 @@ -1 +1 @@ -1 +2 In the previous commit, it appeared as follows: $ diff --version | head -1 diff (GNU diffutils) 3.10.170-23d50 $ diff -u with\ space/1 with\ space/2 --- "with space/1" 1970-01-01 00:00:00.000000000 +0000 +++ "with space/2" 1970-01-01 00:00:00.000000000 +0000 @@ -1 +1 @@ -1 +2 Unlike the old quoting (with quotation marks), the new quoting (with apostrophes) is not supported by GNU patch: can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- 'with space/1' 1970-01-01 00:00:00.000000000 +0000 |+++ 'with space/2' 1970-01-01 00:00:00.000000000 +0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored This regression was discovered using the Quilt testsuite: [124] $ quilt push -qa -- failed Applying patch patches/foo.diff == Applying patch patches/foo.diff The text leading up to this was: != Applying patch patches/revert.diff -------------------------- != Applying patch patches/again.diff |--- 'space [dir]/foo.orig' 2023-09-15 18:02:57.623257723 +0000 != Now at patch patches/again.diff |+++ 'space [dir]/foo' 2023-09-15 18:02:57.625257744 +0000 != ~ -------------------------- != ~ No file to patch. Skipping patch. != ~ 1 out of 1 hunk ignored != ~ Patch patches/foo.diff does not apply (enforce with -f) != ~ [129] $ cd .. -- ok [130] $ rm -rf "space [dir]" -- ok 64 commands (63 passed, 1 failed) make: *** [Makefile:412: test/.setup.ok] Error 1 -- glebfm From unknown Sat Jun 14 19:44:57 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66095: [bug-diffutils] bug#66095: diff quoting for names with spaces changed after v3.10-171-g69ae797392 Resent-From: Andreas =?UTF-8?Q?Gr=C3=BCnbacher?= Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Tue, 19 Sep 2023 12:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66095 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: Paul Eggert Cc: 66095@debbugs.gnu.org, glebfm@altlinux.org X-Debbugs-Original-Cc: bug-diffutils@gnu.org, Gleb Fotengauer-Malinovskiy , 66095@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169512518616682 (code B ref -1); Tue, 19 Sep 2023 12:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Sep 2023 12:06:26 +0000 Received: from localhost ([127.0.0.1]:55546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiZUn-0004L0-Kr for submit@debbugs.gnu.org; Tue, 19 Sep 2023 08:06:25 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiZUi-0004Ki-Pp for submit@debbugs.gnu.org; Tue, 19 Sep 2023 08:06:23 -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 1qiZUL-0005g1-7w for bug-diffutils@gnu.org; Tue, 19 Sep 2023 08:06:00 -0400 Received: from mail-lf1-f42.google.com ([209.85.167.42]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiZUI-0001wh-5r for bug-diffutils@gnu.org; Tue, 19 Sep 2023 08:05:56 -0400 Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-50317080342so3439104e87.2 for ; Tue, 19 Sep 2023 05:05:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695125151; x=1695729951; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=khqfjMDoTh7pQMoqnJpmKM2ZBj33OX1ceXQXV4ZwcpY=; b=fHqcYLL307hHQnlzftx/XDEdXnWRXJuQRSE/wg1t4ArzA0mTdsJhqBX6gQ4O10lPXt 5vYMWp4CJr3/8FiSzQrXKCzGSnYqo7M2o+EFYooVWSifI9+0gpG5QvzVktonmdQCKFoD gjMm8UE9TgwZtJvZaaMGusi3IdgNawEhRiLZ7tvEk4tvEmmWc0Ttimet/IrTVehdMYxt Zgng5daAst2iRJYo+ZHHVUwUW/7STJ0oy4UJAXSwx06K1HC+fQB4mi/3lP7Fm8j8cJj2 bj5kOF0+1edoHXYKEZBc3tBID915uvKUBv/fd2ngvjHTH/qw/3+eIX58JCalJwARznW3 Oy0A== X-Gm-Message-State: AOJu0Yzpxfii8Oxm9uXXzOsPSt/03enJuqQencAx2Wf7Llr13kZeJFEs J8PNUP/j6XFd1D4joZFDzDy/VndjHc+hz6zlscQ= X-Google-Smtp-Source: AGHT+IEGaYPJsCoNOwF1SfXm66gak3fhkAZoq2gFM0WavpIx5xR4Ra+nexArq0TyRfMaL653yCQAhkLmRxu+iB5AsLo= X-Received: by 2002:a19:6714:0:b0:4fd:faf0:6591 with SMTP id b20-20020a196714000000b004fdfaf06591mr8770382lfc.10.1695125150539; Tue, 19 Sep 2023 05:05:50 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Andreas =?UTF-8?Q?Gr=C3=BCnbacher?= Date: Tue, 19 Sep 2023 14:05:39 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=209.85.167.42; envelope-from=andreas.gruenbacher@gmail.com; helo=mail-lf1-f42.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello Paul, I don't know how this change could end up being applied to diffutils, but commit 69ae797 ("cmp,diff,diff3,sdiff: quote more consistently") breaks compatibility with GNU patch and other consumers witho [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (andreas.gruenbacher[at]gmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 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: 0.5 (/) Hello Paul, I don't know how this change could end up being applied to diffutils, but commit 69ae797 ("cmp,diff,diff3,sdiff: quote more consistently") breaks compatibility with GNU patch and other consumers without a discussion, warning, or lead time to at least adjust all the major consumers first. That's not acceptable, so could you please revert this change? The particular quoting style that you seem to object to was introduced in commit e17295d ("diff: encode file names with special characters"). At the time, "git diff" had already been using this format for years, so there was already considerable precedent for not inventing something new. And I believe this argument still applies. Thanks, Andreas Am Di., 19. Sept. 2023 um 00:13 Uhr schrieb Gleb Fotengauer-Malinovskiy : > > Hi, > > Following the commit v3.10-171-g69ae797392 ("cmp,diff,diff3,sdiff: quote > more consistently") the quoting changed as follows: > > $ diff --version | head -1 > diff (GNU diffutils) 3.10.171-69ae7 > $ diff -u with\ space/1 with\ space/2 > --- 'with space/1' 1970-01-01 00:00:00.000000000 +0000 > +++ 'with space/2' 1970-01-01 00:00:00.000000000 +0000 > @@ -1 +1 @@ > -1 > +2 > > In the previous commit, it appeared as follows: > > $ diff --version | head -1 > diff (GNU diffutils) 3.10.170-23d50 > $ diff -u with\ space/1 with\ space/2 > --- "with space/1" 1970-01-01 00:00:00.000000000 +0000 > +++ "with space/2" 1970-01-01 00:00:00.000000000 +0000 > @@ -1 +1 @@ > -1 > +2 > > Unlike the old quoting (with quotation marks), the new quoting (with > apostrophes) is not supported by GNU patch: > > can't find file to patch at input line 3 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |--- 'with space/1' 1970-01-01 00:00:00.000000000 +0000 > |+++ 'with space/2' 1970-01-01 00:00:00.000000000 +0000 > -------------------------- > File to patch: > Skip this patch? [y] > Skipping patch. > 1 out of 1 hunk ignored > > > This regression was discovered using the Quilt testsuite: > > [124] $ quilt push -qa -- failed > Applying patch patches/foo.diff == Applying patch patches/foo.diff > The text leading up to this was: != Applying patch patches/revert.diff > -------------------------- != Applying patch patches/again.diff > |--- 'space [dir]/foo.orig' 2023-09-15 18:02:57.623257723 +0000 != Now at patch patches/again.diff > |+++ 'space [dir]/foo' 2023-09-15 18:02:57.625257744 +0000 != ~ > -------------------------- != ~ > No file to patch. Skipping patch. != ~ > 1 out of 1 hunk ignored != ~ > Patch patches/foo.diff does not apply (enforce with -f) != ~ > [129] $ cd .. -- ok > [130] $ rm -rf "space [dir]" -- ok > 64 commands (63 passed, 1 failed) > make: *** [Makefile:412: test/.setup.ok] Error 1 > > -- > glebfm > > > From unknown Sat Jun 14 19:44:57 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66095: diff quoting for names with spaces changed after v3.10-171-g69ae797392 Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Wed, 20 Sep 2023 07:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66095 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: Gleb Fotengauer-Malinovskiy Cc: Andreas =?UTF-8?Q?Gr=C3=BCnbacher?= , 66095@debbugs.gnu.org Received: via spool by 66095-submit@debbugs.gnu.org id=B66095.16951940359969 (code B ref 66095); Wed, 20 Sep 2023 07:14:01 +0000 Received: (at 66095) by debbugs.gnu.org; 20 Sep 2023 07:13:55 +0000 Received: from localhost ([127.0.0.1]:58180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qirPG-0002aj-OX for submit@debbugs.gnu.org; Wed, 20 Sep 2023 03:13:55 -0400 Received: from mail.cs.ucla.edu ([131.179.128.66]:39812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qirPD-0002aN-W7 for 66095@debbugs.gnu.org; Wed, 20 Sep 2023 03:13:53 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 177983C00D18D; Wed, 20 Sep 2023 00:13: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 wU5KoRTb4Odu; Wed, 20 Sep 2023 00:13:36 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id AB3BB3C00D193; Wed, 20 Sep 2023 00:13:36 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu AB3BB3C00D193 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1695194016; bh=M1Jv2fi/peWfZEC8XnPK5egbeJcieYFM/Yg8+nJ9zEc=; h=Message-ID:Date:MIME-Version:To:From; b=BocrRT4t3WY9hq5LbIPShv4iCVjw/nNZlWlzF7MqTu9fy5fIN/kyhgpiryAxEarTR JIVN7liZyLVBta5tWJh0gw2PySDaVmIPD4L6hDPJsas3k3ClKZtZnUFsnymOqm9o5t sMzx+t8dYHKatihY6sz+WipJksp9N5dSaleeyrgXr3T1Os0WUtqz04JWtCZnQHkp7L Gj1qHFXeW8eYzwXYLSJuePfC0ApOMFK8dPTj7eLvSB/69xaqkEMbsOxrMN2buWgD3b bHkwOnC9qIFrE0c8Kk1m7C0gvX0phWNzI71m6EbsiozE3Qbc4xYQmLf+QfAKYKLYUo DCnvXatLLHBbg== 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 NaGi2HWIrEc9; Wed, 20 Sep 2023 00:13:36 -0700 (PDT) Received: from [192.168.254.12] (unknown [47.147.225.57]) by mail.cs.ucla.edu (Postfix) with ESMTPSA id 865C13C00D18D; Wed, 20 Sep 2023 00:13:36 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------mOfJJ2C8IEHXu1Pr6gYUghJI" Message-ID: Date: Wed, 20 Sep 2023 00:13:36 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US References: From: Paul Eggert Organization: UCLA Computer Science Department In-Reply-To: X-Spam-Score: -1.5 (-) 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.5 (--) This is a multi-part message in MIME format. --------------mOfJJ2C8IEHXu1Pr6gYUghJI Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Thanks for reporting that. I had forgotten about the GNU patch convention. I installed the attached change to GNU diffutils; please give it a try. GNU patch still mishandles file names containing multi-byte characters in some non-UTF-8 locales, but that can be fixed later when someone gets around to it. --------------mOfJJ2C8IEHXu1Pr6gYUghJI Content-Type: text/x-patch; charset=UTF-8; name="0001-diff-go-back-to-C-quoting-for-diff-c-u-headers.patch" Content-Disposition: attachment; filename*0="0001-diff-go-back-to-C-quoting-for-diff-c-u-headers.patch" Content-Transfer-Encoding: base64 RnJvbSA3NzRiOTQyZjcwMGYwMDQ1ZDMwNzkyMzQzNWQyODdjMTgyMzY0Njk5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBUdWUsIDE5IFNlcCAyMDIzIDIzOjM0OjQzIC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gZGlmZjogZ28gYmFjayB0byBDIHF1b3RpbmcgZm9yIGRpZmYgLWMvLXUgaGVhZGVycwoK R2xlYiBGb3RlbmdhdWVyLU1hbGlub3Zza2l5IHJlcG9ydGVkIDxodHRwczovL2J1Z3MvZ251 L29yZy82NjA5NT4KdGhhdCB0aGUgcmVjZW50IGNoYW5nZSB0byBxdW90aW5nIHN0eWxlIGJy b2tlIEdOVSBwYXRjaC4KKiBzcmMvdXRpbC5jOiBJbmNsdWRlIHF1b3RlYXJnLmguCihjdXJy ZW50X25hbWUpOiBOZXcgc3RhdGljIHZhciwgcmVwbGFjaW5nIHRoZSB0aGUgb2xkCmN1cnJl bnRfbmFtZTAgYW5kIGN1cnJlbnRfbmFtZTEuICBBbGwgdXNlcyBjaGFuZ2VkLgooYmVnaW5f b3V0cHV0KTogR28gYmFjayB0byBxdW90aW5nIGZpbGUgbmFtZXMgZm9yIEMsCm5vdCBmb3Ig dGhlIHNoZWxsLCB3aGVuIHRoZXkgY29udGFpbiB0cm91Ymxlc29tZSBjaGFyYWN0ZXJzLgpU aGlzIGlzIG5vdCBhIHNpbXBsZSByZXZlcnQsIGFzIHRoZSByZXZpc2VkIGNvZGUgaGFuZGxl cwptdWx0aS1ieXRlIGNoYXJhY3RlcnMgZXZlbiBpbiBub24tVVRGLTggbG9jYWxlcy4KKiB0 ZXN0cy9maWxlbmFtZS1xdW90aW5nOiBSZXZlcnQgcHJldmlvdXMgY2hhbmdlIHRvIHRoaXMg ZmlsZS4KLS0tCiBORVdTICAgICAgICAgICAgICAgICAgIHwgMTAgKysrKystLS0tLQogc3Jj L3V0aWwuYyAgICAgICAgICAgICB8IDE2ICsrKysrKysrKystLS0tLS0KIHRlc3RzL2ZpbGVu YW1lLXF1b3RpbmcgfCAxOCArKysrKysrKystLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwg MjQgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvTkVXUyBi L05FV1MKaW5kZXggZGY1YzAwMy4uMzYzOGVlMyAxMDA2NDQKLS0tIGEvTkVXUworKysgYi9O RVdTCkBAIC00LDE5ICs0LDE5IEBAIEdOVSBkaWZmdXRpbHMgTkVXUyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC0qLSBvdXRsaW5lIC0qLQogCiAqKiBJbXByb3ZlbWVu dHMKIAotICBQcm9ncmFtcyBub3cgcXVvdGUgZmlsZSBuYW1lcyBtb3JlIGNvbnNpc3RlbnRs eS4KKyAgUHJvZ3JhbXMgbm93IHF1b3RlIGZpbGUgbmFtZXMgbW9yZSBjb25zaXN0ZW50bHkg aW4gZGlhZ25vc3RpY3MuCiAgIEZvciBleGFtcGxlOyAiY21wICdub25lIG9mJyAvZXRjL3Bh c3N3ZCIgbm93IG1pZ2h0IG91dHB1dAogICAiY21wOiBFT0Ygb24g4oCYbm9uZSBvZuKAmSB3 aGljaCBpcyBlbXB0eSIgaW5zdGVhZCBvZiBvdXRwdXR0aW5nCiAgICJjbXA6IEVPRiBvbiBu b25lIG9mIHdoaWNoIGlzIGVtcHR5Ii4gIEluIGRpYWdub3N0aWMgbWVzc2FnZXMKICAgdGhh dCB0cmFkaXRpb25hbGx5IG9taXQgcXVvdGVzIGFuZCB3aGVyZSBiYWNrd2FyZCBjb21wYXRp YmlsaXR5Ci0gIHNlZW1zIHRvIGJlIGltcG9ydGFudCwgcHJvZ3JhbXMgY29udGludWUgdG8g b21pdCBxdW90ZXMgdW5sZXNzIHRoZXkKKyAgc2VlbXMgdG8gYmUgaW1wb3J0YW50LCBwcm9n cmFtcyBjb250aW51ZSB0byBvbWl0IHF1b3RlcyB1bmxlc3MKICAgYSBmaWxlIG5hbWUgY29u dGFpbnMgc2hlbGwgbWV0YWNoYXJhY3RlcnMsIGluIHdoaWNoIGNhc2UgcHJvZ3JhbXMKICAg dXNlIHNoZWxsIHF1b3RpbmcuICBGb3IgZXhhbXBsZSwgYWx0aG91Z2ggZGlmZiBjb250aW51 ZXMgdG8gb3V0cHV0CiAgICJPbmx5IGluIGE6IGIiIGFzIGJlZm9yZSBmb3IgbW9zdCBmaWxl IG5hbWVzLCBpdCBub3cgb3V0cHV0cwogICAiT25seSBpbiAnYTogYic6ICdjOiBkJyIgaW5z dGVhZCBvZiAiT25seSBpbiBhOiBiOiBjOiBkIiBiZWNhdXNlIHRoZQotICBmaWxlIG5hbWVz ICdhOiBiJyBhbmQgJ2M6IGQnIGNvbnRhaW4gc3BhY2VzLiAgTGFzdGx5LCBkaWZmIC1jIGFu ZCAtdQotICBoZWFkZXJzIG5vdyBxdW90ZSBmaWxlIG5hbWVzIGZvciB0aGUgc2hlbGwgd2hl biBuZWVkZWQsIGluc3RlYWQgb2YKLSAgdXNpbmcgdGhlaXIgb3duIGlkaW9zeW5jcmF0aWMg cXVvdGluZyBzdHlsZS4KKyAgZmlsZSBuYW1lcyAnYTogYicgYW5kICdjOiBkJyBjb250YWlu IHNwYWNlcy4gIEZvciBjb21wYXRpYmlsaXR5CisgIHdpdGggcHJldmlvdXMgcHJhY3RpY2Us IGRpZmYgLWMgYW5kIC11IGhlYWRlcnMgY29udGludWUgdG8gcXVvdGUgZm9yCisgIEMgcmF0 aGVyIHRoYW4gZm9yIHRoZSBzaGVsbC4KIAogICBkaWZmIG5vdyBvdXRwdXRzIG1vcmUgaW5m b3JtYXRpb24gd2hlbiBzeW1ib2xpYyBsaW5rcyBkaWZmZXIsIGUuZy4sCiAgICJTeW1ib2xp YyBsaW5rcyDigJhkL2bigJkgLT4g4oCYYeKAmSBhbmQg4oCYZS9m4oCZIC0+IOKAmGLigJkg ZGlmZmVyIiwgbm90IGp1c3QKZGlmZiAtLWdpdCBhL3NyYy91dGlsLmMgYi9zcmMvdXRpbC5j CmluZGV4IDlkNmRmMjUuLmMyNjk5MTggMTAwNjQ0Ci0tLSBhL3NyYy91dGlsLmMKKysrIGIv c3JjL3V0aWwuYwpAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1ZGUgPGVycm9yLmg+CiAjaW5j bHVkZSA8ZmxleG1lbWJlci5oPgogI2luY2x1ZGUgPG1jZWwuaD4KKyNpbmNsdWRlIDxxdW90 ZWFyZy5oPgogI2luY2x1ZGUgPHN5c3RlbS1xdW90ZS5oPgogI2luY2x1ZGUgPHhhbGxvYy5o PgogCkBAIC00MDYsOCArNDA3LDcgQEAgY2xlYW51cF9zaWduYWxfaGFuZGxlcnMgKHZvaWQp CiAgICAgfQogfQogCi1zdGF0aWMgY2hhciBjb25zdCAqY3VycmVudF9uYW1lMDsKLXN0YXRp YyBjaGFyIGNvbnN0ICpjdXJyZW50X25hbWUxOworc3RhdGljIGNoYXIgY29uc3QgKmN1cnJl bnRfbmFtZVsyXTsKIHN0YXRpYyBib29sIGN1cnJlbnRseV9yZWN1cnNpdmU7CiBzdGF0aWMg Ym9vbCBjb2xvcnNfZW5hYmxlZDsKIApAQCAtODE5LDggKzgxOSw4IEBAIGNoZWNrX2NvbG9y X291dHB1dCAoYm9vbCBpc19waXBlKQogdm9pZAogc2V0dXBfb3V0cHV0IChjaGFyIGNvbnN0 ICpuYW1lMCwgY2hhciBjb25zdCAqbmFtZTEsIGJvb2wgcmVjdXJzaXZlKQogewotICBjdXJy ZW50X25hbWUwID0gbmFtZTA7Ci0gIGN1cnJlbnRfbmFtZTEgPSBuYW1lMTsKKyAgY3VycmVu dF9uYW1lWzBdID0gbmFtZTA7CisgIGN1cnJlbnRfbmFtZVsxXSA9IG5hbWUxOwogICBjdXJy ZW50bHlfcmVjdXJzaXZlID0gcmVjdXJzaXZlOwogICBvdXRmaWxlID0gbnVsbHB0cjsKIH0K QEAgLTgzNiw4ICs4MzYsMTIgQEAgYmVnaW5fb3V0cHV0ICh2b2lkKQogICBpZiAob3V0Zmls ZSkKICAgICByZXR1cm47CiAKLSAgY2hhciBjb25zdCAqbmFtZXNbMl0gPSB7c3F1b3RlICgw LCBjdXJyZW50X25hbWUwKSwKLQkJCSAgc3F1b3RlICgxLCBjdXJyZW50X25hbWUxKX07Cisg IGNoYXIgY29uc3QgKm5hbWVzWzJdOworICBmb3IgKGludCBmID0gMDsgZiA8IDI7IGYrKykK KyAgICBuYW1lc1tmXSA9IHF1b3RlYXJnX25fc3R5bGUgKGYsCisJCQkJIChzdHJjaHIgKGN1 cnJlbnRfbmFtZVtmXSwgJyAnKQorCQkJCSAgPyBjX3F1b3Rpbmdfc3R5bGUgOiBjX21heWJl X3F1b3Rpbmdfc3R5bGUpLAorCQkJCSBjdXJyZW50X25hbWVbZl0pOwogCiAgIC8qIENvbnN0 cnVjdCB0aGUgaGVhZGVyIG9mIHRoaXMgcGllY2Ugb2YgZGlmZi4gICovCiAgIC8qIFBPU0lY IDEwMDMuMS0yMDE3IHNwZWNpZmllcyB0aGlzIGZvcm1hdC4gIEJ1dCB0aGVyZSBhcmUgc29t ZSBidWdzIGluCmRpZmYgLS1naXQgYS90ZXN0cy9maWxlbmFtZS1xdW90aW5nIGIvdGVzdHMv ZmlsZW5hbWUtcXVvdGluZwppbmRleCAyMWU4YzgxLi4yZTc1YTAzIDEwMDc1NQotLS0gYS90 ZXN0cy9maWxlbmFtZS1xdW90aW5nCisrKyBiL3Rlc3RzL2ZpbGVuYW1lLXF1b3RpbmcKQEAg LTYsMjMgKzYsMjMgQEAKIGZhaWw9MAogCiBjYXQgPDxFT0YgPiBleHAtIHx8IGZhaWw9MQot ZGlmZiAtTiAtciAnYS8gJyAnYi8gJworZGlmZiAtTiAtciAiYS8gIiAiYi8gIgogMGExCiA+ IHNwYWNlCiBFT0YKIAogY2F0IDw8RU9GID4gZXhwLS11IHx8IGZhaWw9MQotZGlmZiAtTiAt ciAtdSAnYS8gJyAnYi8gJwotLS0tICdhLyAnCi0rKysgJ2IvICcKK2RpZmYgLU4gLXIgLXUg ImEvICIgImIvICIKKy0tLSAiYS8gIgorKysrICJiLyAiCiBAQCAtMCwwICsxIEBACiArc3Bh Y2UKIEVPRgogCiBjYXQgPDxFT0YgPiBleHAtLWMgfHwgZmFpbD0xCi1kaWZmIC1OIC1yIC1j ICdhLyAnICdiLyAnCi0qKiogJ2EvICcKLS0tLSAnYi8gJworZGlmZiAtTiAtciAtYyAiYS8g IiAiYi8gIgorKioqICJhLyAiCistLS0gImIvICIKICoqKioqKioqKioqKioqKgogKioqIDAg KioqKgogLS0tIDEgLS0tLQpAQCAtNDEsOCArNDEsOCBAQCBkb25lCiBybSAtZiAiYi8gIgog CiBjYXQgPDxFT0YgPiBleHAgfHwgZmFpbD0xCi0tLS0gJ2EvJyQnXHQnCi0rKysgJ2IvJyQn XDAwMScKKy0tLSAiYS9cdCIKKysrKyAiYi9cMDAxIgogQEAgLTEgKzEgQEAKIC10YWIKICtv bmUKLS0gCjIuMzkuMgoK --------------mOfJJ2C8IEHXu1Pr6gYUghJI--