From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#44471: [PATCH] Simplify text-quoting-style Date: Thu, 5 Nov 2020 08:18:21 -0800 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000600faf05b35e729f" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8092"; mail-complaints-to="usenet@ciao.gmane.io" To: 44471@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Nov 05 17:19:31 2020 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 1kahz0-0001w0-5I for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 05 Nov 2020 17:19:30 +0100 Original-Received: from localhost ([::1]:53536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kahyz-0008Ri-5D for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 05 Nov 2020 11:19:29 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kahyZ-0008QK-3g for bug-gnu-emacs@gnu.org; Thu, 05 Nov 2020 11:19:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42405) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kahyY-0001IR-Q6 for bug-gnu-emacs@gnu.org; Thu, 05 Nov 2020 11:19:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kahyY-0007hZ-LH for bug-gnu-emacs@gnu.org; Thu, 05 Nov 2020 11:19:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 05 Nov 2020 16:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44471 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.160459311829570 (code B ref -1); Thu, 05 Nov 2020 16:19:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 5 Nov 2020 16:18:38 +0000 Original-Received: from localhost ([127.0.0.1]:53951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kahy9-0007gs-KV for submit@debbugs.gnu.org; Thu, 05 Nov 2020 11:18:38 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:41228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kahy8-0007gl-4F for submit@debbugs.gnu.org; Thu, 05 Nov 2020 11:18:36 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kahy7-0007yc-UZ for bug-gnu-emacs@gnu.org; Thu, 05 Nov 2020 11:18:35 -0500 Original-Received: from mail-ej1-f43.google.com ([209.85.218.43]:44980) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kahy5-00017f-V6 for bug-gnu-emacs@gnu.org; Thu, 05 Nov 2020 11:18:35 -0500 Original-Received: by mail-ej1-f43.google.com with SMTP id o23so2465196ejn.11 for ; Thu, 05 Nov 2020 08:18:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:date:message-id:subject:to; bh=+82XWLp3bfYfbmYsqAyEy9BuUkx2joalCjTIK0/9P6U=; b=U2rR78nSU/Fu/nXkGbpT97qeUBNY7MpP5bD48T/2PEqhO8RKeTSs1oRhP75yINfaCS mtuHO0z72xUPgCsBppXzhqVY+CA0qtuC0Z4SfmvQHznwLrssta61cS0u18BlMfNQqi0h T85Zfof3DQCV9ObHGznKOfuGJvt/icrdEcCYHcjZDCYfSogb6boUo+tdlCa9pecjuN20 bxj4XJTk5iL/RihpgLBdQQN7u3ZbqMIPGdU/MdmrfRYmewCJXg/PLdphtx2bnbhQMYsJ meZ2hcHa1auANM4yW1WFxpHr/R/PwlrhQYmTmB0JUeuhqSZeG3vN7aLRNKFsBa6RezMC 2JLg== X-Gm-Message-State: AOAM533P10iB9PvJlGzIyZNhM9BALo8XJoZ6Y5TOJhOna0CRVcNmU1Hu kLL4UhBiFRbq1U8eOXItbDPgBjsnL8EgbGICnwCcwusM X-Google-Smtp-Source: ABdhPJx9GUVdTCfhWCP+CPkp0YywV6GIhWkJUhJ1Olcwpu9WbAYWZo9N1Bwk83XHRK6VLC3XaNWTn+vDtNVPfS6DkZY= X-Received: by 2002:a17:906:8058:: with SMTP id x24mr3149949ejw.272.1604593110731; Thu, 05 Nov 2020 08:18:30 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Thu, 5 Nov 2020 08:18:21 -0800 Received-SPF: pass client-ip=209.85.218.43; envelope-from=stefankangas@gmail.com; helo=mail-ej1-f43.google.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/05 11:18:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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-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" Xref: news.gmane.io gmane.emacs.bugs:192738 Archived-At: --000000000000600faf05b35e729f Content-Type: text/plain; charset="UTF-8" I found an opportunity to simplify the code for text-quoting-style. See the attached patch. The patch also improves the name of the defun `get-quoting-style' by changing it to `text-quoting-style'. (This new name matches the old C function name and the existing variable name.) Any comments? --000000000000600faf05b35e729f Content-Type: text/x-diff; charset="utf-8"; name="0001-Simplify-text-quoting-style.patch" Content-Disposition: attachment; filename="0001-Simplify-text-quoting-style.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: 288afcc6886207e4_0.1 RnJvbSA2NjMxODkwY2M3NGMwYzc5YTJhZTIwZmU5ZjBiMWJkNjY3MDZiNGM5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5AbWFyeGlzdC5zZT4KRGF0 ZTogVGh1LCA1IE5vdiAyMDIwIDE1OjMyOjQ1ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gU2ltcGxp ZnkgdGV4dC1xdW90aW5nLXN0eWxlCgoqIHNyYy9kb2MuYyAodGV4dF9xdW90aW5nX3N0eWxlKTog UmVtb3ZlIGZ1bmN0aW9uIGJ5IG1lcmdpbmcgaXQuLi4KKEZ0ZXh0X3F1b3Rpbmdfc3R5bGUpOiAu Li5oZXJlLiAgUmVuYW1lIGZyb20gRmdldF9xdW90aW5nX3N0eWxlLgooc3ltc19vZl9kb2MpOiBV cGRhdGUgZGVmc3ViciBmb3IgRnRleHRfcXVvdGluZ19zdHlsZS4KKiBzcmMvbGlzcC5oIChlbnVt IHRleHRfcXVvdGluZ19zdHlsZSk6IFJlbW92ZSBlbnVtLgoqIHNyYy9kb3BybnQuYyAoZG9wcm50 KToKKiBzcmMvZWRpdGZucy5jIChzdHlsZWRfZm9ybWF0KToKKiBsaXNwL2hlbHAuZWwgKHN1YnN0 aXR1dGUtY29tbWFuZC1rZXlzKTogVXBkYXRlIGNhbGxlcnMgdG8gdXNlCnRleHQtcXVvdGluZy1z dHlsZS4KLS0tCiBsaXNwL2hlbHAuZWwgIHwgIDQgKystLQogc3JjL2RvYy5jICAgICB8IDQwICsr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHNyYy9kb3BybnQuYyAgfCAg OCArKysrLS0tLQogc3JjL2VkaXRmbnMuYyB8ICA2ICsrKy0tLQogc3JjL2xpc3AuaCAgICB8IDEy IC0tLS0tLS0tLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCA0NyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2hlbHAuZWwgYi9saXNwL2hlbHAuZWwKaW5kZXgg NDY2ZmYyMWViMi4uMzJlZTg0YjVmOSAxMDA2NDQKLS0tIGEvbGlzcC9oZWxwLmVsCisrKyBiL2xp c3AvaGVscC5lbApAQCAtMTEwMywxMyArMTEwMywxMyBAQCBzdWJzdGl0dXRlLWNvbW1hbmQta2V5 cwogICAgICAgICAgICAgICAgICAgICAgIChkZXNjcmliZS1tYXAtdHJlZSB0aGlzLWtleW1hcCB0 IChucmV2ZXJzZSBlYXJsaWVyLW1hcHMpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5pbCBuaWwgdCBuaWwgbmlsIHQpKSkpKSkpKQogICAgICAgICAgICAgIDs7IDIu IEhhbmRsZSBxdW90ZXMuCi0gICAgICAgICAgICAgKChhbmQgKGVxIChnZXQtcXVvdGluZy1zdHls ZSkgJ2N1cnZlKQorICAgICAgICAgICAgICgoYW5kIChlcSAodGV4dC1xdW90aW5nLXN0eWxlKSAn Y3VydmUpCiAgICAgICAgICAgICAgICAgICAgKG9yIChhbmQgKD0gKGZvbGxvd2luZy1jaGFyKSA/ XGApCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHByb2cxIHQgKGluc2VydCAi4oCYIikp KQogICAgICAgICAgICAgICAgICAgICAgICAoYW5kICg9IChmb2xsb3dpbmctY2hhcikgPycpCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKHByb2cxIHQgKGluc2VydCAi4oCZIikpKSkpCiAg ICAgICAgICAgICAgIChkZWxldGUtY2hhciAxKSkKLSAgICAgICAgICAgICAoKGFuZCAoZXEgKGdl dC1xdW90aW5nLXN0eWxlKSAnc3RyYWlnaHQpCisgICAgICAgICAgICAgKChhbmQgKGVxICh0ZXh0 LXF1b3Rpbmctc3R5bGUpICdzdHJhaWdodCkKICAgICAgICAgICAgICAgICAgICAoPSAoZm9sbG93 aW5nLWNoYXIpID9cYCkpCiAgICAgICAgICAgICAgIChpbnNlcnQgIiciKQogICAgICAgICAgICAg ICAoZGVsZXRlLWNoYXIgMSkpCmRpZmYgLS1naXQgYS9zcmMvZG9jLmMgYi9zcmMvZG9jLmMKaW5k ZXggZjFjZTI2NmQzOS4uNWYyM2UzZDBiYiAxMDA2NDQKLS0tIGEvc3JjL2RvYy5jCisrKyBiL3Ny Yy9kb2MuYwpAQCAtNjgyLDM3ICs2ODIsMjUgQEAgZGVmYXVsdF90b19ncmF2ZV9xdW90aW5nX3N0 eWxlICh2b2lkKQogCSAgJiYgRVEgKEFSRUYgKGR2LCAwKSwgbWFrZV9maXhudW0gKCdgJykpKTsK IH0KIAotLyogUmV0dXJuIHRoZSBjdXJyZW50IGVmZmVjdGl2ZSB0ZXh0IHF1b3Rpbmcgc3R5bGUu ICAqLwotZW51bSB0ZXh0X3F1b3Rpbmdfc3R5bGUKLXRleHRfcXVvdGluZ19zdHlsZSAodm9pZCkK K0RFRlVOICgidGV4dC1xdW90aW5nLXN0eWxlIiwgRnRleHRfcXVvdGluZ19zdHlsZSwKKyAgICAg ICBTdGV4dF9xdW90aW5nX3N0eWxlLCAwLCAwLCAwLAorICAgICAgIGRvYzogLyogUmV0dXJuIHRo ZSBjdXJyZW50IGVmZmVjdGl2ZSB0ZXh0IHF1b3Rpbmcgc3R5bGUuCitTZWUgdmFyaWFibGUgYHRl eHQtcXVvdGluZy1zdHlsZScuICAqLykKKyAgKHZvaWQpCiB7CisgIC8qIFVzZSBncmF2ZSBhY2Nl bnQgYW5kIGFwb3N0cm9waGUgYGxpa2UgdGhpcycuICAqLwogICBpZiAoTklMUCAoVnRleHRfcXVv dGluZ19zdHlsZSkKICAgICAgID8gZGVmYXVsdF90b19ncmF2ZV9xdW90aW5nX3N0eWxlICgpCiAg ICAgICA6IEVRIChWdGV4dF9xdW90aW5nX3N0eWxlLCBRZ3JhdmUpKQotICAgIHJldHVybiBHUkFW RV9RVU9USU5HX1NUWUxFOworICAgIHJldHVybiBRZ3JhdmU7CisKKyAgLyogVXNlIGFwb3N0cm9w aGVzICdsaWtlIHRoaXMnLiAgKi8KICAgZWxzZSBpZiAoRVEgKFZ0ZXh0X3F1b3Rpbmdfc3R5bGUs IFFzdHJhaWdodCkpCi0gICAgcmV0dXJuIFNUUkFJR0hUX1FVT1RJTkdfU1RZTEU7Ci0gIGVsc2UK LSAgICByZXR1cm4gQ1VSVkVfUVVPVElOR19TVFlMRTsKLX0KKyAgICByZXR1cm4gUXN0cmFpZ2h0 OwogCi0vKiBUaGlzIGlzIGp1c3QgYSBMaXNwIHdyYXBwZXIgZm9yIHRleHRfcXVvdGluZ19zdHls ZSBhYm92ZS4gICovCi1ERUZVTiAoImdldC1xdW90aW5nLXN0eWxlIiwgRmdldF9xdW90aW5nX3N0 eWxlLAotICAgICAgIFNnZXRfcXVvdGluZ19zdHlsZSwgMCwgMCwgMCwKLSAgICAgICBkb2M6IC8q IFJldHVybiB0aGUgY3VycmVudCBlZmZlY3RpdmUgdGV4dCBxdW90aW5nIHN0eWxlLgotU2VlIHZh cmlhYmxlIGB0ZXh0LXF1b3Rpbmctc3R5bGUnLiAgKi8pCi0gICh2b2lkKQotewotICBzd2l0Y2gg KHRleHRfcXVvdGluZ19zdHlsZSAoKSkKLSAgICB7Ci0gICAgY2FzZSBTVFJBSUdIVF9RVU9USU5H X1NUWUxFOgotICAgICAgcmV0dXJuIFFzdHJhaWdodDsKLSAgICBjYXNlIENVUlZFX1FVT1RJTkdf U1RZTEU6Ci0gICAgICByZXR1cm4gUWN1cnZlOwotICAgIGNhc2UgR1JBVkVfUVVPVElOR19TVFlM RToKLSAgICBkZWZhdWx0OgotICAgICAgcmV0dXJuIFFncmF2ZTsKLSAgICB9CisgIC8qIFVzZSBj dXJ2ZWQgc2luZ2xlIHF1b3RlcyDigJhsaWtlIHRoaXPigJkuICAqLworICBlbHNlCisgICAgcmV0 dXJuIFFjdXJ2ZTsKIH0KIAogDApAQCAtNzU1LDUgKzc0Myw1IEBAIHN5bXNfb2ZfZG9jICh2b2lk KQogICBkZWZzdWJyICgmU2RvY3VtZW50YXRpb24pOwogICBkZWZzdWJyICgmU2RvY3VtZW50YXRp b25fcHJvcGVydHkpOwogICBkZWZzdWJyICgmU3NuYXJmX2RvY3VtZW50YXRpb24pOwotICBkZWZz dWJyICgmU2dldF9xdW90aW5nX3N0eWxlKTsKKyAgZGVmc3ViciAoJlN0ZXh0X3F1b3Rpbmdfc3R5 bGUpOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2RvcHJudC5jIGIvc3JjL2RvcHJudC5jCmluZGV4IGNl MjU5ZDA3Y2YuLjkzMTY0OTc3MjAgMTAwNjQ0Ci0tLSBhL3NyYy9kb3BybnQuYworKysgYi9zcmMv ZG9wcm50LmMKQEAgLTE5OSw3ICsxOTksNyBAQCBkb3BybnQgKGNoYXIgKmJ1ZmZlciwgcHRyZGlm Zl90IGJ1ZnNpemUsIGNvbnN0IGNoYXIgKmZvcm1hdCwKICAgLyogQnVmZmVyIHdlIGhhdmUgZ290 IHdpdGggbWFsbG9jLiAgKi8KICAgY2hhciAqYmlnX2J1ZmZlciA9IE5VTEw7CiAKLSAgZW51bSB0 ZXh0X3F1b3Rpbmdfc3R5bGUgcXVvdGluZ19zdHlsZSA9IHRleHRfcXVvdGluZ19zdHlsZSAoKTsK KyAgTGlzcF9PYmplY3QgcXVvdGluZ19zdHlsZSA9IEZ0ZXh0X3F1b3Rpbmdfc3R5bGUgKCk7CiAK ICAgYnVmc2l6ZS0tOwogCkBAIC00ODIsMTMgKzQ4MiwxMyBAQCBkb3BybnQgKGNoYXIgKmJ1ZmZl ciwgcHRyZGlmZl90IGJ1ZnNpemUsIGNvbnN0IGNoYXIgKmZvcm1hdCwKIAogICAgICAgY2hhciBj b25zdCAqc3JjOwogICAgICAgcHRyZGlmZl90IHNyY2xlbjsKLSAgICAgIGlmIChxdW90aW5nX3N0 eWxlID09IENVUlZFX1FVT1RJTkdfU1RZTEUgJiYgZm10Y2hhciA9PSAnYCcpCisgICAgICBpZiAo RVEgKHF1b3Rpbmdfc3R5bGUsIFFjdXJ2ZSkgJiYgZm10Y2hhciA9PSAnYCcpCiAJc3JjID0gdUxT UU0sIHNyY2xlbiA9IHNpemVvZiB1TFNRTSAtIDE7Ci0gICAgICBlbHNlIGlmIChxdW90aW5nX3N0 eWxlID09IENVUlZFX1FVT1RJTkdfU1RZTEUgJiYgZm10Y2hhciA9PSAnXCcnKQorICAgICAgZWxz ZSBpZiAoRVEgKHF1b3Rpbmdfc3R5bGUsIFFjdXJ2ZSkgJiYgZm10Y2hhciA9PSAnXCcnKQogCXNy YyA9IHVSU1FNLCBzcmNsZW4gPSBzaXplb2YgdVJTUU0gLSAxOwogICAgICAgZWxzZQogCXsKLQkg IGlmIChxdW90aW5nX3N0eWxlID09IFNUUkFJR0hUX1FVT1RJTkdfU1RZTEUgJiYgZm10Y2hhciA9 PSAnYCcpCisJICBpZiAoRVEgKHF1b3Rpbmdfc3R5bGUsIFFzdHJhaWdodCkgJiYgZm10Y2hhciA9 PSAnYCcpCiAJICAgIGZtdGNoYXIgPSAnXCcnOwogCSAgZWFzc2VydCAoQVNDSUlfQ0hBUl9QIChm bXRjaGFyKSk7CiAJICAqYnVmcHRyKysgPSBmbXRjaGFyOwpkaWZmIC0tZ2l0IGEvc3JjL2VkaXRm bnMuYyBiL3NyYy9lZGl0Zm5zLmMKaW5kZXggY2E2Yjg5ODFlYi4uMzIwZmJkYzY2OSAxMDA2NDQK LS0tIGEvc3JjL2VkaXRmbnMuYworKysgYi9zcmMvZWRpdGZucy5jCkBAIC0zMTQ3LDcgKzMxNDcs NyBAQCBzdHlsZWRfZm9ybWF0IChwdHJkaWZmX3QgbmFyZ3MsIExpc3BfT2JqZWN0ICphcmdzLCBi b29sIG1lc3NhZ2UpCiAgICAgaWYgKFNUUklOR1AgKGFyZ3NbaV0pICYmIFNUUklOR19NVUxUSUJZ VEUgKGFyZ3NbaV0pKQogICAgICAgbXVsdGlieXRlID0gdHJ1ZTsKIAotICBpbnQgcXVvdGluZ19z dHlsZSA9IG1lc3NhZ2UgPyB0ZXh0X3F1b3Rpbmdfc3R5bGUgKCkgOiAtMTsKKyAgTGlzcF9PYmpl Y3QgcXVvdGluZ19zdHlsZSA9IG1lc3NhZ2UgPyBGdGV4dF9xdW90aW5nX3N0eWxlICgpIDogUW5p bDsKIAogICBwdHJkaWZmX3QgaXNwZWM7CiAgIHB0cmRpZmZfdCBuc3BlYyA9IDA7CkBAIC0zNzY3 LDcgKzM3NjcsNyBAQCBzdHlsZWRfZm9ybWF0IChwdHJkaWZmX3QgbmFyZ3MsIExpc3BfT2JqZWN0 ICphcmdzLCBib29sIG1lc3NhZ2UpCiAJICB1bnNpZ25lZCBjaGFyIHN0cltNQVhfTVVMVElCWVRF X0xFTkdUSF07CiAKIAkgIGlmICgoZm9ybWF0X2NoYXIgPT0gJ2AnIHx8IGZvcm1hdF9jaGFyID09 ICdcJycpCi0JICAgICAgJiYgcXVvdGluZ19zdHlsZSA9PSBDVVJWRV9RVU9USU5HX1NUWUxFKQor CSAgICAgICYmIEVRIChxdW90aW5nX3N0eWxlLCBRY3VydmUpKQogCSAgICB7CiAJICAgICAgaWYg KCEgbXVsdGlieXRlKQogCQl7CkBAIC0zNzc4LDcgKzM3NzgsNyBAQCBzdHlsZWRfZm9ybWF0IChw dHJkaWZmX3QgbmFyZ3MsIExpc3BfT2JqZWN0ICphcmdzLCBib29sIG1lc3NhZ2UpCiAJICAgICAg Y29udmJ5dGVzID0gMzsKIAkgICAgICBuZXdfcmVzdWx0ID0gdHJ1ZTsKIAkgICAgfQotCSAgZWxz ZSBpZiAoZm9ybWF0X2NoYXIgPT0gJ2AnICYmIHF1b3Rpbmdfc3R5bGUgPT0gU1RSQUlHSFRfUVVP VElOR19TVFlMRSkKKwkgIGVsc2UgaWYgKGZvcm1hdF9jaGFyID09ICdgJyAmJiBFUSAocXVvdGlu Z19zdHlsZSwgUXN0cmFpZ2h0KSkKIAkgICAgewogCSAgICAgIGNvbnZzcmMgPSAiJyI7CiAJICAg ICAgbmV3X3Jlc3VsdCA9IHRydWU7CmRpZmYgLS1naXQgYS9zcmMvbGlzcC5oIGIvc3JjL2xpc3Au aAppbmRleCBhM2NmYjUwNDRkLi5jNmViNDRkNzRlIDEwMDY0NAotLS0gYS9zcmMvbGlzcC5oCisr KyBiL3NyYy9saXNwLmgKQEAgLTQ0OTUsMTggKzQ0OTUsNiBAQCAjZGVmaW5lIERBRU1PTl9SVU5O SU5HICh3MzJfZGFlbW9uX2V2ZW50ICE9IElOVkFMSURfSEFORExFX1ZBTFVFKQogZXh0ZXJuIHZv aWQgc3ltc19vZl9jYWxscHJvYyAodm9pZCk7CiAKIC8qIERlZmluZWQgaW4gZG9jLmMuICAqLwot ZW51bSB0ZXh0X3F1b3Rpbmdfc3R5bGUKLSAgewotICAgIC8qIFVzZSBjdXJ2ZWQgc2luZ2xlIHF1 b3RlcyDigJhsaWtlIHRoaXPigJkuICAqLwotICAgIENVUlZFX1FVT1RJTkdfU1RZTEUsCi0KLSAg ICAvKiBVc2UgZ3JhdmUgYWNjZW50IGFuZCBhcG9zdHJvcGhlICBgbGlrZSB0aGlzJy4gICovCi0g ICAgR1JBVkVfUVVPVElOR19TVFlMRSwKLQotICAgIC8qIFVzZSBhcG9zdHJvcGhlcyAnbGlrZSB0 aGlzJy4gICovCi0gICAgU1RSQUlHSFRfUVVPVElOR19TVFlMRQotICB9OwotZXh0ZXJuIGVudW0g dGV4dF9xdW90aW5nX3N0eWxlIHRleHRfcXVvdGluZ19zdHlsZSAodm9pZCk7CiBleHRlcm4gTGlz cF9PYmplY3QgcmVhZF9kb2Nfc3RyaW5nIChMaXNwX09iamVjdCk7CiBleHRlcm4gTGlzcF9PYmpl Y3QgZ2V0X2RvY19zdHJpbmcgKExpc3BfT2JqZWN0LCBib29sLCBib29sKTsKIGV4dGVybiB2b2lk IHN5bXNfb2ZfZG9jICh2b2lkKTsKLS0gCjIuMjguMAoK --000000000000600faf05b35e729f--