From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Liu Hui Newsgroups: gmane.emacs.bugs Subject: bug#66768: 30.0.50; [PATCH] Improve read/append behavior of eshell history command Date: Fri, 27 Oct 2023 12:15:00 +0800 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000a9a8e60608aaf30a" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24657"; mail-complaints-to="usenet@ciao.gmane.io" To: 66768@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Oct 27 06:17:53 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qwEID-0006Jn-8b for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 27 Oct 2023 06:17:53 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwEHt-0002vc-CZ; Fri, 27 Oct 2023 00:17:33 -0400 Original-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 1qwEHr-0002vT-SA for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2023 00:17:31 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwEHr-00084w-HX for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2023 00:17:31 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qwEIM-0006Ju-Kr for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2023 00:18:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Liu Hui Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 27 Oct 2023 04:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66768 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.169838022924230 (code B ref -1); Fri, 27 Oct 2023 04:18:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 27 Oct 2023 04:17:09 +0000 Original-Received: from localhost ([127.0.0.1]:34871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwEHV-0006Ij-5c for submit@debbugs.gnu.org; Fri, 27 Oct 2023 00:17:09 -0400 Original-Received: from lists.gnu.org ([2001:470:142::17]:58592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwEHT-0006Hf-19 for submit@debbugs.gnu.org; Fri, 27 Oct 2023 00:17:07 -0400 Original-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 1qwEGs-0002UF-JZ for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2023 00:16:30 -0400 Original-Received: from mail-vs1-xe2f.google.com ([2607:f8b0:4864:20::e2f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwEGq-0007ju-Br for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2023 00:16:30 -0400 Original-Received: by mail-vs1-xe2f.google.com with SMTP id ada2fe7eead31-457cc01b805so759296137.0 for ; Thu, 26 Oct 2023 21:16:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698380185; x=1698984985; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=bhnIvqiTq2F0QR70md648u6cCoEVIQ0v3CNJrmHuztM=; b=eciDnADIC070qu8mz6pXCMdFIDdl9Az55rjP4e+soSEEgq0eEpY0NBZORWHf0yez7y DsN8MdVmmJWZmO/JglDWTACfD0b3oJ8yg5zuA/vzMKGPb1Cf9AqzAESCVBtLlBh710US nuJ6eTJIBNL0kEhXH1QJCOV/3Narim+5saUusBVokCxo/P3m9oQwV/cw0XgC22jxEt0V xBZRBTkz6ya9GNQ6LZyedVy/6+hKqPNyFJYAzaVQp+NrV4XjrYNQjbIU/669Wc134tFd fwec3tOUTti8yce/CGgAx3OaG+YfcrTvxmH2oP3i2xchP7joeaqbhGIIzWlpPXulF1nq fZqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698380185; x=1698984985; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bhnIvqiTq2F0QR70md648u6cCoEVIQ0v3CNJrmHuztM=; b=NoXKR/S8sIsqTMOFo1tfAtO1Xw6ThYaQjgfY1Eu29IBEwld63UiNTzfqdfdRB9YqKl 4l5tSaPVq9N0s1vsJkqkhTvqyMdixA+r/fPfmtB90X2lMES0wQLDS7aCjQglSKBqmr4V 9SE0eEIh40NkXw+ArlpzGbEBNmtYs3Z0f22C4PHtK15JYJc/zIkrdbELf0hjdN7ws/h9 nNKRxwjFgMsUt9RH9fKmYye1YccuUTGktRAFIgznkAegV58GlrB8kMzohcqi9opjc3bj aZ0j/+jR7Hu68NJ5WYydLMvgzHAmvzOHNViTVvIQarOTka3t2buxmgwZ6lt0C6sH5p33 VLAQ== X-Gm-Message-State: AOJu0Yxbr4wRAD38Agu4SRJUyVhmqwtvKB5WWZeQAgUPtgBAE2cWsqvn fnfI+6On/JQ9+gORD4J8Nz3cbk1eM0/z4Fv6mQNIuGk/eu8= X-Google-Smtp-Source: AGHT+IEsaE49cRxauQmS1n3a4c1Ir8udb6NKePfd+wBq748vKIXAkoVjBL1wVy8ZHcrtz0cRCJ4GvxwGRFdom0o1nxs= X-Received: by 2002:a67:e013:0:b0:45a:b852:9d6d with SMTP id c19-20020a67e013000000b0045ab8529d6dmr1598151vsl.13.1698380185671; Thu, 26 Oct 2023 21:16:25 -0700 (PDT) Received-SPF: pass client-ip=2607:f8b0:4864:20::e2f; envelope-from=liuhui1610@gmail.com; helo=mail-vs1-xe2f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:273334 Archived-At: --000000000000a9a8e60608aaf30a Content-Type: text/plain; charset="UTF-8" Hi, This patch fixes some corner cases of the eshell history command about reading (-r) and appending (-a). Recipe: 1. create a sample history file containing some lines, e.g. ls 2. emacs -Q --eval "(setq eshell-history-file-name ...)" -f eshell 3. type following commands: $ ls $ history -a $ cd /tmp $ history -a 'history -a' doesn't distinguish old history from new history items of current buffer, and always appends the whole history list whenever it is called, resulting in a mess of the content of history file: ls ls ls history -a ls ls history -a cd /tmp/ history -a If another eshell buffer or emacs instance is launched before we quit this eshell buffer, they will read messed history. Thus this patch changes behavior of 'history -a' from "append current history list to history file" to "append new history in current buffer to history file", which is also consistent with bash's 'history -a'. 4. continue to type: $ (setq eshell-hist-ignoredups t) $ history -a; history -r $ history 'history -r', which calls eshell-read-history, doesn't remove consecutive "ls" duplicates from the history file. Thus this patch amends eshell-read-history to make it respect the eshell-hist-ignoredups option (both t and 'erase). Since 'history -r' replaces current history list, which is actually equivalent to bash's 'history -c; history -r', I have updated the help text. Maybe it should be split into two commands, i.e. adding 'history -c'? Best, -- Liu Hui --000000000000a9a8e60608aaf30a Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Improve-read-append-behavior-of-eshell-history-comma.patch" Content-Disposition: attachment; filename="0001-Improve-read-append-behavior-of-eshell-history-comma.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lo7zdb4g0 RnJvbSAyMGFkNzA5OTVjNWZiYmI2NGU4NTAxZjVmMWIyMTZlMTdiMzkwMGFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUgSHVpIDxsaXVodWkxNjEwQGdtYWlsLmNvbT4KRGF0ZTog RnJpLCAyNyBPY3QgMjAyMyAxMDowNzowOSArMDgwMApTdWJqZWN0OiBbUEFUQ0hdIEltcHJvdmUg cmVhZC9hcHBlbmQgYmVoYXZpb3Igb2YgZXNoZWxsIGhpc3RvcnkgY29tbWFuZAoKKiBsaXNwL2Vz aGVsbC9lbS1oaXN0LmVsIChlc2hlbGwtaGlzdC0tbmV3LWl0ZW1zKTogTmV3IHZhcmlhYmxlLgoo ZXNoZWxsLWhpc3QtaW5pdGlhbGl6ZSk6IFNldCBgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcycuCihl c2hlbGwvaGlzdG9yeSk6IENoYW5nZSB0aGUgYmVoYXZpb3Igb2YgJ2hpc3RvcnkgLWEnIHRvICJh cHBlbmQgbmV3Cmhpc3RvcnkgaW4gY3VycmVudCBidWZmZXIgdG8gaGlzdG9yeSBmaWxlIi4gIFVw ZGF0ZSBoZWxwIHRleHQuCihlc2hlbGwtYWRkLWlucHV0LXRvLWhpc3RvcnkpOiBJbmNyZWFzZSBj b3VudGVyIG9mIG5ldyBoaXN0b3J5IGl0ZW1zLgooZXNoZWxsLXJlYWQtaGlzdG9yeSk6IFJlc3Bl Y3QgZXNoZWxsLWhpc3QtaWdub3JlZHVwcyBvcHRpb24uCihlc2hlbGwtd3JpdGUtaGlzdG9yeSk6 IEFkZCBvcHRpb25hbCBhcmd1bWVudCBORVctSVRFTVMgYW5kIHN1cHBvcnQKd3JpdGluZyBvbmx5 IG5ldyBoaXN0b3J5IGl0ZW1zIHRvIGhpc3RvcnkgZmlsZS4KLS0tCiBsaXNwL2VzaGVsbC9lbS1o aXN0LmVsIHwgNDcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvbGlzcC9lc2hlbGwvZW0taGlzdC5lbCBiL2xpc3AvZXNoZWxsL2VtLWhpc3QuZWwKaW5k ZXggOWQ0YjcyYjAxZGYuLjQ2YmQ4NzM1YzNjIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lbS1o aXN0LmVsCisrKyBiL2xpc3AvZXNoZWxsL2VtLWhpc3QuZWwKQEAgLTE5NSw2ICsxOTUsOSBAQCBl c2hlbGwtaGlzdG9yeS1yaW5nCiAoZGVmdmFyIGVzaGVsbC1oaXN0b3J5LWluZGV4IG5pbCkKIChk ZWZ2YXIgZXNoZWxsLW1hdGNoaW5nLWlucHV0LWZyb20taW5wdXQtc3RyaW5nICIiKQogKGRlZnZh ciBlc2hlbGwtc2F2ZS1oaXN0b3J5LWluZGV4IG5pbCkKKyhkZWZ2YXIgZXNoZWxsLWhpc3QtLW5l dy1pdGVtcyAwCisgICJUaGUgbnVtYmVyIG9mIG5ldyBoaXN0b3J5IGl0ZW1zIHRoYXQgaGF2ZSBu b3QgYmVlbiB3cml0dGVuIHRvCitmaWxlLiAgVGhpcyB2YXJpYWJsZSBpcyBsb2NhbCBpbiBlYWNo IGVzaGVsbCBidWZmZXIuIikKIAogKGRlZnZhci1rZXltYXAgZXNoZWxsLWlzZWFyY2gtbWFwCiAg IDpkb2MgIktleW1hcCB1c2VkIGluIGlzZWFyY2ggaW4gRXNoZWxsLiIKQEAgLTI4Myw2ICsyODYs NyBAQCBlc2hlbGwtaGlzdC1pbml0aWFsaXplCiAKICAgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ2Vz aGVsbC1oaXN0b3J5LWluZGV4KQogICAobWFrZS1sb2NhbC12YXJpYWJsZSAnZXNoZWxsLXNhdmUt aGlzdG9yeS1pbmRleCkKKyAgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ2VzaGVsbC1oaXN0LS1uZXct aXRlbXMpCiAKICAgKGlmIChtaW5pYnVmZmVyLXdpbmRvdy1hY3RpdmUtcCAoc2VsZWN0ZWQtd2lu ZG93KSkKICAgICAgIChzZXRxLWxvY2FsIGVzaGVsbC1zYXZlLWhpc3Rvcnktb24tZXhpdCBuaWwp CkBAIC0zMjMsMTEgKzMyNywxMSBAQCBlc2hlbGwvaGlzdG9yeQogICAoZXNoZWxsLWV2YWwtdXNp bmctb3B0aW9ucwogICAgImhpc3RvcnkiIGFyZ3MKICAgICcoKD9yICJyZWFkIiBuaWwgcmVhZC1o aXN0b3J5Ci0JICJyZWFkIGZyb20gaGlzdG9yeSBmaWxlIHRvIGN1cnJlbnQgaGlzdG9yeSBsaXN0 IikKKwkgImNsZWFyIGN1cnJlbnQgaGlzdG9yeSBsaXN0IGFuZCByZWFkIGZyb20gaGlzdG9yeSBm aWxlIHRvIGl0IikKICAgICAgKD93ICJ3cml0ZSIgbmlsIHdyaXRlLWhpc3RvcnkKIAkgIndyaXRl IGN1cnJlbnQgaGlzdG9yeSBsaXN0IHRvIGhpc3RvcnkgZmlsZSIpCiAgICAgICg/YSAiYXBwZW5k IiBuaWwgYXBwZW5kLWhpc3RvcnkKLQkgImFwcGVuZCBjdXJyZW50IGhpc3RvcnkgbGlzdCB0byBo aXN0b3J5IGZpbGUiKQorCSAiYXBwZW5kIG5ldyBoaXN0b3J5IGluIGN1cnJlbnQgYnVmZmVyIHRv IGhpc3RvcnkgZmlsZSIpCiAgICAgICg/aCAiaGVscCIgbmlsIG5pbCAiZGlzcGxheSB0aGlzIHVz YWdlIG1lc3NhZ2UiKQogICAgICA6dXNhZ2UgIltuXSBbLXJ3YSBbZmlsZW5hbWVdXSIKICAgICAg OnBvc3QtdXNhZ2UKQEAgLTM1MSw3ICszNTUsNyBAQCBlc2hlbGwvaGlzdG9yeQogICAgICAoY29u ZAogICAgICAgKHJlYWQtaGlzdG9yeSAoZXNoZWxsLXJlYWQtaGlzdG9yeSBmaWxlKSkKICAgICAg ICh3cml0ZS1oaXN0b3J5IChlc2hlbGwtd3JpdGUtaGlzdG9yeSBmaWxlKSkKLSAgICAgIChhcHBl bmQtaGlzdG9yeSAoZXNoZWxsLXdyaXRlLWhpc3RvcnkgZmlsZSB0KSkKKyAgICAgIChhcHBlbmQt aGlzdG9yeSAoZXNoZWxsLXdyaXRlLWhpc3RvcnkgZmlsZSAnYXBwZW5kICduZXctaXRlbXMpKQog ICAgICAgKHQKICAgICAgICAobGV0KiAoKGluZGV4ICgxLSAob3IgbGVuZ3RoIChyaW5nLWxlbmd0 aCBlc2hlbGwtaGlzdG9yeS1yaW5nKSkpKQogCSAgICAgIChyZWYgKC0gKHJpbmctbGVuZ3RoIGVz aGVsbC1oaXN0b3J5LXJpbmcpIGluZGV4KSkpCkBAIC0zOTQsNiArMzk4LDggQEAgZXNoZWxsLWFk ZC1pbnB1dC10by1oaXN0b3J5CiAgICAgICAgICAgICAgICAoXyAgICAgICAgICAgICAgICAgICAg ICAgOyBBZGQgaWYgbm90IGFscmVhZHkgdGhlIGxhdGVzdCBlbnRyeQogICAgICAgICAgICAgICAg IChvciAocmluZy1lbXB0eS1wIGVzaGVsbC1oaXN0b3J5LXJpbmcpCiAgICAgICAgICAgICAgICAg ICAgIChub3QgKHN0cmluZy1lcXVhbCAoZXNoZWxsLWdldC1oaXN0b3J5IDApIGlucHV0KSkpKSkp CisgICAgKHNldHEgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcworICAgICAgICAgIChtaW4gZXNoZWxs LWhpc3Rvcnktc2l6ZSAoMSsgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcykpKQogICAgIChlc2hlbGwt cHV0LWhpc3RvcnkgaW5wdXQpKQogICAoc2V0cSBlc2hlbGwtc2F2ZS1oaXN0b3J5LWluZGV4IGVz aGVsbC1oaXN0b3J5LWluZGV4KQogICAoc2V0cSBlc2hlbGwtaGlzdG9yeS1pbmRleCBuaWwpKQpA QCAtNDU1LDIxICs0NjEsMjggQEAgZXNoZWxsLXJlYWQtaGlzdG9yeQogCQkgICAgICAocmUtc2Vh cmNoLWJhY2t3YXJkICJeWyBcdF0qXFwoW14jXG5dLipcXClbIFx0XSokIgogCQkJCQkgIG5pbCB0 KSkKIAkgICAgKGxldCAoKGhpc3RvcnkgKG1hdGNoLXN0cmluZyAxKSkpCi0JICAgICAgKGlmIChv ciAobnVsbCBpZ25vcmUtZHVwcykKLQkJICAgICAgKHJpbmctZW1wdHktcCByaW5nKQotCQkgICAg ICAobm90IChzdHJpbmctZXF1YWwgKHJpbmctcmVmIHJpbmcgMCkgaGlzdG9yeSkpKQotCQkgIChy aW5nLWluc2VydC1hdC1iZWdpbm5pbmcKKyAgICAgICAgICAgICAgKGlmIChvciAocmluZy1lbXB0 eS1wIHJpbmcpCisgICAgICAgICAgICAgICAgICAgICAgKG51bGwgaWdub3JlLWR1cHMpCisgICAg ICAgICAgICAgICAgICAgICAgKGFuZCAobm90IChzdHJpbmctZXF1YWwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChyaW5nLXJlZiByaW5nICgxLSAocmluZy1sZW5ndGggcmluZykp KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGlzdG9yeSkpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAobm90IChhbmQgKGVxIGlnbm9yZS1kdXBzICdlcmFzZSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocmluZy1tZW1iZXIgcmluZyBoaXN0b3J5 KSkpKSkKKyAgICAgICAgICAgICAgICAgIChyaW5nLWluc2VydC1hdC1iZWdpbm5pbmcKIAkJICAg cmluZyAoc3Vic3QtY2hhci1pbi1zdHJpbmcgP1wxNzcgP1xuIGhpc3RvcnkpKSkpCiAJICAgIChz ZXRxIGNvdW50ICgxKyBjb3VudCkpKSkKIAkoc2V0cSBlc2hlbGwtaGlzdG9yeS1yaW5nIHJpbmcK LQkgICAgICBlc2hlbGwtaGlzdG9yeS1pbmRleCBuaWwpKSkpKSkKKwkgICAgICBlc2hlbGwtaGlz dG9yeS1pbmRleCBuaWwKKyAgICAgICAgICAgICAgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcyAwKSkp KSkpCiAKLShkZWZ1biBlc2hlbGwtd3JpdGUtaGlzdG9yeSAoJm9wdGlvbmFsIGZpbGVuYW1lIGFw cGVuZCkKKyhkZWZ1biBlc2hlbGwtd3JpdGUtaGlzdG9yeSAoJm9wdGlvbmFsIGZpbGVuYW1lIGFw cGVuZCBuZXctaXRlbXMpCiAgICJXcml0ZXMgdGhlIGJ1ZmZlcidzIGBlc2hlbGwtaGlzdG9yeS1y aW5nJyB0byBhIGhpc3RvcnkgZmlsZS4KLVRoZSBuYW1lIG9mIHRoZSBmaWxlIGlzIGdpdmVuIGJ5 IHRoZSB2YXJpYWJsZQotYGVzaGVsbC1oaXN0b3J5LWZpbGUtbmFtZScuICBUaGUgb3JpZ2luYWwg Y29udGVudHMgb2YgdGhlIGZpbGUgYXJlCi1sb3N0IGlmIGBlc2hlbGwtaGlzdG9yeS1yaW5nJyBp cyBub3QgZW1wdHkuICBJZgotYGVzaGVsbC1oaXN0b3J5LWZpbGUtbmFtZScgaXMgbmlsIHRoaXMg ZnVuY3Rpb24gZG9lcyBub3RoaW5nLgorSWYgdGhlIG9wdGlvbmFsIGFyZ3VtZW50IEZJTEVOQU1F IGlzIG5pbCwgdGhlIHZhbHVlIG9mCitgZXNoZWxsLWhpc3RvcnktZmlsZS1uYW1lJyBpcyB1c2Vk LiAgVGhpcyBmdW5jdGlvbiBkb2VzIG5vdGhpbmcKK2lmIHRoZSB2YWx1ZSByZXNvbHZlcyB0byBu aWwuICBUaGUgb3B0aW9uYWwgYXJndW1lbnQgQVBQRU5EIGhhcwordGhlIHNhbWUgbWVhbmluZyBh cyB0aGF0IGluIGB3cml0ZS1yZWdpb24nLiAgSWYgdGhlIG9wdGlvbmFsCithcmd1bWVudCBORVct SVRFTVMgaXMgbm9uLW5pbCwgd3JpdGVzIG9ubHkgbmV3IGhpc3RvcnkgaXRlbXMgdGhhdAoraGF2 ZSBub3QgYmVlbiB3cml0dGVuIHRvIGFueSBoaXN0b3J5IGZpbGUgeWV0LgogCiBVc2VmdWwgd2l0 aGluIHByb2Nlc3Mgc2VudGluZWxzLgogCkBAIC00ODAsMTMgKzQ5MywxNCBAQCBlc2hlbGwtd3Jp dGUtaGlzdG9yeQogICAgICAoKG9yIChudWxsIGZpbGUpCiAJICAoZXF1YWwgZmlsZSAiIikKIAkg IChudWxsIGVzaGVsbC1oaXN0b3J5LXJpbmcpCi0JICAocmluZy1lbXB0eS1wIGVzaGVsbC1oaXN0 b3J5LXJpbmcpKQorCSAgKHJpbmctZW1wdHktcCBlc2hlbGwtaGlzdG9yeS1yaW5nKQorICAgICAg ICAgIChhbmQgbmV3LWl0ZW1zICg9IGVzaGVsbC1oaXN0LS1uZXctaXRlbXMgMCkpKQogICAgICAg bmlsKQogICAgICAoKG5vdCAoZmlsZS13cml0YWJsZS1wIHJlc29sdmVkLWZpbGUpKQogICAgICAg KG1lc3NhZ2UgIkNhbm5vdCB3cml0ZSBoaXN0b3J5IGZpbGUgJXMiIHJlc29sdmVkLWZpbGUpKQog ICAgICAodAogICAgICAgKGxldCogKChyaW5nIGVzaGVsbC1oaXN0b3J5LXJpbmcpCi0JICAgICAo aW5kZXggKHJpbmctbGVuZ3RoIHJpbmcpKSkKKwkgICAgIChpbmRleCAoaWYgbmV3LWl0ZW1zIGVz aGVsbC1oaXN0LS1uZXctaXRlbXMgKHJpbmctbGVuZ3RoIHJpbmcpKSkpCiAJOzsgV3JpdGUgaXQg YWxsIG91dCBpbnRvIGEgYnVmZmVyIGZpcnN0LiAgTXVjaCBmYXN0ZXIsIGJ1dAogCTs7IG1lc3Np ZXIsIHRoYW4gd3JpdGluZyBpdCBvbmUgbGluZSBhdCBhIHRpbWUuCiAJKHdpdGgtdGVtcC1idWZm ZXIKQEAgLTQ5OSw3ICs1MTMsOCBAQCBlc2hlbGwtd3JpdGUtaGlzdG9yeQogCSAgICAgIChzdWJz dC1jaGFyLWluLXJlZ2lvbiBzdGFydCAoMS0gKHBvaW50KSkgP1xuID9cMTc3KSkpCiAJICAoZXNo ZWxsLXdpdGgtcHJpdmF0ZS1maWxlLW1vZGVzCiAJICAgKHdyaXRlLXJlZ2lvbiAocG9pbnQtbWlu KSAocG9pbnQtbWF4KSByZXNvbHZlZC1maWxlIGFwcGVuZAotCQkJICduby1tZXNzYWdlKSkpKSkp KSkKKwkJCSAnbm8tbWVzc2FnZSkpKQorICAgICAgICAoc2V0cSBlc2hlbGwtaGlzdC0tbmV3LWl0 ZW1zIDApKSkpKSkKIAogKGRlZnVuIGVzaGVsbC1saXN0LWhpc3RvcnkgKCkKICAgIkxpc3QgaW4g aGVscCBidWZmZXIgdGhlIGJ1ZmZlcidzIGlucHV0IGhpc3RvcnkuIgotLSAKMi4yNS4xCgo= --000000000000a9a8e60608aaf30a--