From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Drew Adams Newsgroups: gmane.emacs.bugs Subject: bug#55894: 26.3; [PATCH] `find-lisp.el' bugs Date: Fri, 10 Jun 2022 22:06:58 +0000 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="_002_SJ0PR10MB548882B9FA3D91D90F08F8DDF3A69SJ0PR10MB5488namp_" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11183"; mail-complaints-to="usenet@ciao.gmane.io" To: 55894@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jun 11 00:08:21 2022 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 1nzmnk-0002jm-IC for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 11 Jun 2022 00:08:20 +0200 Original-Received: from localhost ([::1]:53228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzmnj-0005no-JY for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 10 Jun 2022 18:08:19 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzmnS-0005l9-Jf for bug-gnu-emacs@gnu.org; Fri, 10 Jun 2022 18:08:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:57601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzmnS-0003AY-3X for bug-gnu-emacs@gnu.org; Fri, 10 Jun 2022 18:08:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nzmnR-00042O-UJ for bug-gnu-emacs@gnu.org; Fri, 10 Jun 2022 18:08:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Drew Adams Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 10 Jun 2022 22:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55894 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.165489883715457 (code B ref -1); Fri, 10 Jun 2022 22:08:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 10 Jun 2022 22:07:17 +0000 Original-Received: from localhost ([127.0.0.1]:51498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nzmmj-00041D-0A for submit@debbugs.gnu.org; Fri, 10 Jun 2022 18:07:17 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:60204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nzmmh-000416-8U for submit@debbugs.gnu.org; Fri, 10 Jun 2022 18:07:16 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzmmh-0005PF-34 for bug-gnu-emacs@gnu.org; Fri, 10 Jun 2022 18:07:15 -0400 Original-Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:17072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzmmd-00035R-AE for bug-gnu-emacs@gnu.org; Fri, 10 Jun 2022 18:07:14 -0400 Original-Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25AK4YLk025310 for ; Fri, 10 Jun 2022 22:07:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : content-type : mime-version; s=corp-2021-07-09; bh=iaq2SiZOyXRh501b/pAp36y5fdF/E9iw/zf8B6Xeyq4=; b=Ioy3ECXAztKpSpTJWARJ3vMl7Dc5dC7jvh5SZhSLSgjK/vQg38GgFzoKi4BwWE62xgku 3ovlZJTvDCR8udnsifBSbX/mKRW/Rux8ABhcjveK2gJ56tAbIF2KAAdT+2MIIWn7iYyI wDhGJqTb+0PENuGdwRYrTw37sCVn79VBOVbmQJwn9xO4ESR2HyAr3+j8sIkzwTlKXIgq p5kCbIX/wa/XPVZQccz25qZ6BlQmnQsz9F7ANbpB4Bc95hGh+/sBt/lsSX1hDRz5XPRZ ao0z4kk958XGXI8J3PAiKjtecTfLYVTuYv6fj/oXS6QcC/ztCimZsW80KoWpPo1B6buk 4A== Original-Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gfyxspx8h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 10 Jun 2022 22:07:01 +0000 Original-Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25ALubvv037310 for ; Fri, 10 Jun 2022 22:07:00 GMT Original-Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2174.outbound.protection.outlook.com [104.47.58.174]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gfwu6fqs3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 10 Jun 2022 22:07:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WXq+ugi3cQAtYR+cjQARS4jUJFWbFMnIyOtsjBJB9kxCJEOqzY3h4ZgJqCUD/QCyfuCt4NwuxEQBBu0k0uR+D+c3a/SMAcnMguxkvvCri61TbG/3OKHgG4TsVhlR+PJMWIBnG/WwAQEEpQsNkm3OwyR8BAE8qX1dxa6AfwKSI0sAxn+EzD1aw3+9QZk1L14iVNPCOzrATP8QdWYB6VIgsOOrwU4tlR9WKAWlG/OMnhZ9nB5DkcqRrgGLT4OY2KbISSFJzqpwveTkl+AD6wvvlwzprL/lUvLSR+kG6B1l3m4CsM48H4tjqGjAkqeBIwJ49RmNLzQFVQhCcsP0kihvMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iaq2SiZOyXRh501b/pAp36y5fdF/E9iw/zf8B6Xeyq4=; b=fYpCvidIBX3b0E+ZnJU7j2VOfTxUAo2S7WCqu5ThCJ+UdrWuqUNtx+FuIwhYIgxH8YZNncLVAzqTtQhDi/rID2La6hLVbgy1/K9tamgoYXxPB6AvjX5suYjWQRSBSYETq/BuWAYsgaaKUgT1u9GzyYgIhMHBLUz8hg2S4vqTx6Myp8bgovkAeFqNUw8VPhIkaJPB0URhgKVFfRqrmrwJEG5m//JbzJyypiJcsUEJhxq2CVNrcpMNOt6nXkuE4L+Hb22wwZLbdJJde7KsUGMM+stR1+PgzAOCpIyoBE2mddd0fBWw8VFg62yqoP3IJTmdCNVfMmOQUZsc7j1Y7ah67A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iaq2SiZOyXRh501b/pAp36y5fdF/E9iw/zf8B6Xeyq4=; b=IdT4RNZW/FqZ8AEA+beK7oFOUzyRojjuXRMQB3qj92tXB73QP2rNwdGnfUghUZ47aNDHuHUHVSzYYFLGdjno3eB1zJIk4cPYoGo1Ob9kHmEiDIRmq82Q26KhSHhYOUDZV/7GCdxpVYZA7lMyjKLF/1U7dYCfVYyOygz/02Jk59s= Original-Received: from SJ0PR10MB5488.namprd10.prod.outlook.com (2603:10b6:a03:37e::19) by BN6PR10MB1586.namprd10.prod.outlook.com (2603:10b6:404:48::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.12; Fri, 10 Jun 2022 22:06:58 +0000 Original-Received: from SJ0PR10MB5488.namprd10.prod.outlook.com ([fe80::818c:10bf:c1b5:e224]) by SJ0PR10MB5488.namprd10.prod.outlook.com ([fe80::818c:10bf:c1b5:e224%4]) with mapi id 15.20.5332.015; Fri, 10 Jun 2022 22:06:58 +0000 Thread-Topic: 26.3; [PATCH] `find-lisp.el' bugs Thread-Index: Adh9FSztVHPZgbUhSn2YKO1YxOYmYQ== Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e0e4e639-c51e-4cbb-b3a9-08da4b2d89d8 x-ms-traffictypediagnostic: BN6PR10MB1586:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: c1LV7WIr0Kap7Xqk7RYJZC/PcHonn4JkTQ6L4zpq3zPmcMoqJzS6btMEnt+GqHf6td25xLaapCygI2UYh4h9MtwefYeVrCaGFAqXUb/RvtcpN1ONAiU9OIyKmWwRIetaakKmzr+k1BbDO3w2F8uPEbn671cr+k/pRzOMlTo0be4NyxPAveHGw0uohifyD49RSlLjJ8d1jLmarheI8K12N7trOv9ix9oNqC/j5B6YZU0OA193V7gD0EsUfeLzzVETT/XfQcRBCipNk9rdba3d7nNjrMYFyq5X7EYd+YiR2Sg2WO7OxkqL13c7CGZT2LJnOGsAVmcKaDyQ+9GkwQCgNzyAfdKMVsfuV0ye0wR6kzjhUk/DWMJ1KzrLjr6Zacd7c31g30QbBi4Rm/areZ7UCKR5F+MGjCm3bCXCjYrJ7l2EWA6gBfLZbnXXW6pTZc2oRCHB2vculqEkbuoHbAu5gZpeUrTmunNF4y3/Og3zVeJLuR2Dv9XDYpCb1UIFLg79M/ZDoxfAQeM9SKVrDBLPkLViFIYM5q4Nh9/ZTR5+Xn2qNCe24VpU4BUwKUPrwExHsbUkTHBNctmHscGK3baPE2Z3/8AEPu49/XEeBlUcj+0AJr95O/AgdOQTiipMFYLDVSUvqyiLlj9r7UNv78BmVPlKt3EWhZ6MTEGbTME6CDEidKQoWPG6SYraBo6VuFwDUdc0HOtt6IxenE/HSqnfd8oMWZ9S8xTWaa+4ELPEKTMeRC9jABiIZaQk5KgtB 31VdMyRBBcQAfFbU7fJmrKHfpkUrkvFgW8oyMaILng+xqzjVF+rptOXEGTm5Q7NybiI x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR10MB5488.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(366004)(5660300002)(38070700005)(6506007)(52536014)(966005)(8936002)(9686003)(71200400001)(6916009)(508600001)(26005)(316002)(7696005)(86362001)(45080400002)(64756008)(66946007)(8676002)(66476007)(76116006)(66556008)(66446008)(38100700002)(99936003)(83380400001)(55016003)(186003)(122000001)(44832011)(2906002)(33656002)(81973001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: KqdLgAukawGkJaEUCIjHhK/rlgrdQKdoBP/MwkhBWh3AusoqnKImN+W/XkOgs5jLeSWM0ua0dxZB3Xne4YI/0qrhmNa0g9ZEPNFOWvvrZG6ivN5pVOBNiR/0JG0Qn7KG5eTB4U8FvMTnE4FUa/Jp3jyx1Z08yN/hND0Am1ktv6STYgHPumv36Rm/jUXyxyZv4xHgFw0G+V4tk8mhB0bQV0d85vQ1v4PDLxEL5exwlNlPc4jgHLRTG/JlOcteqlje3+LApfReUWPdUaGCwWtdgg6oHmI/8zwjdXLeVdtrEXcSD1SdE2tgR1zTolg+mVEvjzl+N7JNZOFbJrt/NAtuXvCLoTI8r3G2Ey987MUHM62VpZ3r+XxQWVnzdOyuPd8w6QildTWtmGkU6gtNcH6x7djsrdhOM/U78x6pDduhduG2FBkqNyZxli1+sfuNwYO0fVbPyGr6N/Za3aFG/QAkwlwvJINUOIjlzavQVI3StFXWqhmKc4owjAdN01A2bMtW91b04urQ7MJRn8LUmulsl0AVyg0ewwLmcTO9lNadg8UqfA8ElZFtNFOTogglQZ0RgsVOT/446v+Z95msWSmW7YRBJxhIzqmgUrF9iRoZPNM2qYB4demC0IUPI8aH5WxkIhFGc5Zyu4END9Zljnt3l1ApL4QaDoUFndbY4otka8E4+b+mg6ZPZJ4ocZuhvp+RWsKenVFfyE2cgXqtnuKC6+2J36RYb1/dc5ZQAIqCIipIdZecA0MTYQ4W93 Ti2iKPvUqzJuJsDAewyrGgWuIyjIyk9i0OsZn907qEseF2qLl8pfwlE8Qi3lWv0uo2ugAg7lq5MFQmjRLz0ityvClvZ5Y6tDZa X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5488.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0e4e639-c51e-4cbb-b3a9-08da4b2d89d8 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jun 2022 22:06:58.4325 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: cQrxHm9D5zqrQ60aLBK2JpXCA/cO6xADH3wpB68Jdn2ErAkg63OJ1ZV2WZHJH8aAjgTTKwjNsEOPa+TNoUjm2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR10MB1586 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517, 18.0.874 definitions=2022-06-10_09:2022-06-09, 2022-06-10 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206100083 X-Proofpoint-ORIG-GUID: ocZRJ1ZdCctr-5DwodmPGw-WSZR4Cjtf X-Proofpoint-GUID: ocZRJ1ZdCctr-5DwodmPGw-WSZR4Cjtf Received-SPF: pass client-ip=205.220.165.32; envelope-from=drew.adams@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" Xref: news.gmane.io gmane.emacs.bugs:234242 Archived-At: --_002_SJ0PR10MB548882B9FA3D91D90F08F8DDF3A69SJ0PR10MB5488namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable `find-lisp.el' is an old file that doesn't seem to have gotten much love. It's apparently been updated just to change things like use of (set (make-local-variable...)) to (setq-local...). (I wasn't aware of this library till I saw a blog post by Micky Petersen: https://www.masteringemacs.org/article/working-multiple-files-dired.) The attached patch fixes a few bugs that prevent using it in some important ways: (1) opening a Dired buffer that explicitly lists its listed files or dirs (i.e. a snapshot Dired buffer, where DIRNAME is a cons), (2) using its listing with a `dired-actual-switches' value that contains switch `F', (3) properly handling a listed file or dir name that starts with a space char. [#1 is an important use case. Because a `find' command (Lisp or not) can take quite a while, it can be useful to make a snapshot of its result, i.e., save the list of files and later restore a Dired buffer for that explicit set of files, without rerunning `find'. For that use case, at least, these bugs need to be fixed.] The patch does the following. 1-2 are improvements, 3-4 are bug fixes. 1. Add other-window versions of commands `find-lisp-find-dired' and `find-lisp-find-dired-subdirectories'. (Really, both command names should be shortened. Really, most names in this library should be shortened/improved. And really, the name `find-lisp-find-dired' is not good - besides a confusing combination of name components, it doesn't tell you that it's only about files, not files and dirs - its companion for listing only subdirs has that in its name.) 2. `find-lisp-find-dired-internal': Added optional arg OTHER-WINDOW. 3. `find-lisp-find-dired-insert-file': * Add a doc string. * Put text property `dired-filename' on the inserted file/dir name. (This fixes the mistreatment of file/dir names that start with a space char.) * Start with `dired-actual-switches', instead of just "". In particular, this is to keep switch `F'. 4. `find-lisp-format': If `F' listing switch is present then append `/' to listed directories. Attached is a patch against master today. Other changes could also be made, both to clean up the code and to improve the behavior. But that will wait for someone else. In GNU Emacs 26.3 (build 1, x86_64-w64-mingw32) of 2019-08-29 Repository revision: 96dd0196c28bc36779584e47fffcca433c9309cd Windowing system distributor `Microsoft Corp.', version 10.0.19044 Configured using: `configure --without-dbus --host=3Dx86_64-w64-mingw32 --without-compress-install 'CFLAGS=3D-O2 -static -g3'' --_002_SJ0PR10MB548882B9FA3D91D90F08F8DDF3A69SJ0PR10MB5488namp_ Content-Type: application/octet-stream; name="find-lisp-2022-06-10a.patch" Content-Description: find-lisp-2022-06-10a.patch Content-Disposition: attachment; filename="find-lisp-2022-06-10a.patch"; size=5591; creation-date="Fri, 10 Jun 2022 21:52:43 GMT"; modification-date="Fri, 10 Jun 2022 22:06:58 GMT" Content-Transfer-Encoding: base64 ZGlmZiAtdSBmaW5kLWxpc3AuZWwgZmluZC1saXNwLVBBVENIRUQtMjAyMi0wNi0xMGEuZWwKLS0t IGZpbmQtbGlzcC5lbAkyMDIyLTA2LTEwIDA4OjEzOjUzLjU0MDEzNzMwMCAtMDcwMAorKysgZmlu ZC1saXNwLVBBVENIRUQtMjAyMi0wNi0xMGEuZWwJMjAyMi0wNi0xMCAxNDoyNDoyOC44NDUyNTkx MDAgLTA3MDAKQEAgLTE2Niw3ICsxNjYsNyBAQAogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIGZp bmQtbGlzcC1maW5kLWRpcmVkIChkaXIgcmVnZXhwKQotICAiRmluZCBmaWxlcyBpbiBESVIsIG1h dGNoaW5nIFJFR0VYUC4iCisgICJGaW5kLCB0aGVuIGRpcmVkLCB0aGUgZmlsZXMgd2l0aGluIERJ UiB3aG9zZSBuYW1lcyBtYXRjaCBSRUdFWFAuIgogICAoaW50ZXJhY3RpdmUgIkRGaW5kIGZpbGVz IGluIGRpcmVjdG9yeTogXG5zTWF0Y2hpbmcgcmVnZXhwOiAiKQogICAobGV0ICgoZmluZC1saXNw LXJlZ2V4cCByZWdleHApKQogICAgIChmaW5kLWxpc3AtZmluZC1kaXJlZC1pbnRlcm5hbApAQCAt MTc1LDM0ICsxNzUsNTQgQEAKICAgICAgJ2ZpbmQtbGlzcC1kZWZhdWx0LWRpcmVjdG9yeS1wcmVk aWNhdGUKICAgICAgIipGaW5kIExpc3AgRGlyZWQqIikpKQogCisoZGVmdW4gZmluZC1saXNwLWZp bmQtZGlyZWQtb3RoZXItd2luZG93IChkaXIgcmVnZXhwKQorICAiU2FtZSBhcyBgZmluZC1saXNw LWZpbmQtZGlyZWQnLCBidXQgdXNlIGFub3RoZXIgd2luZG93LiIKKyAgKGludGVyYWN0aXZlICJE RmluZCBmaWxlcyBpbiBkaXJlY3Rvcnk6IFxuc01hdGNoaW5nIHJlZ2V4cDogIikKKyAgKGxldCAo KGZpbmQtbGlzcC1yZWdleHAgcmVnZXhwKSkKKyAgICAoZmluZC1saXNwLWZpbmQtZGlyZWQtaW50 ZXJuYWwKKyAgICAgZGlyCisgICAgICdmaW5kLWxpc3AtZGVmYXVsdC1maWxlLXByZWRpY2F0ZQor ICAgICAnZmluZC1saXNwLWRlZmF1bHQtZGlyZWN0b3J5LXByZWRpY2F0ZQorICAgICAiKkZpbmQg TGlzcCBEaXJlZCoiCisgICAgICdPVEhFUi1XSU5ET1cpKSkKKwogOzsgSnVzdCB0aGUgc3ViZGly ZWN0b3JpZXMKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gZmluZC1saXNwLWZpbmQtZGlyZWQtc3Vi ZGlyZWN0b3JpZXMgKGRpcikKICAgIkZpbmQgYWxsIHN1YmRpcmVjdG9yaWVzIG9mIERJUi4iCi0g IChpbnRlcmFjdGl2ZSAiREZpbmQgc3ViZGlyZWN0b3JpZXMgb2YgZGlyZWN0b3J5OiAiKQorICAo aW50ZXJhY3RpdmUgIkREaXJlZCBkZXNjZW5kZW50IGRpcnMgb2YgZGlyZWN0b3J5OiAiKQogICAo ZmluZC1saXNwLWZpbmQtZGlyZWQtaW50ZXJuYWwKICAgIGRpcgogICAgJ2ZpbmQtbGlzcC1maWxl LXByZWRpY2F0ZS1pcy1kaXJlY3RvcnkKICAgICdmaW5kLWxpc3AtZGVmYXVsdC1kaXJlY3Rvcnkt cHJlZGljYXRlCiAgICAiKkZpbmQgTGlzcCBEaXJlZCBTdWJkaXJlY3RvcmllcyoiKSkKIAorOzs7 IyMjYXV0b2xvYWQKKyhkZWZ1biBmaW5kLWxpc3AtZmluZC1kaXJlZC1zdWJkaXJzLW90aGVyLXdp bmRvdyAoZGlyKQorICAiU2FtZSBhcyBgZmluZC1saXNwLWZpbmQtZGlyZWQtc3ViZGlyZWN0b3Jp ZXMnLCBidXQgdXNlIGFub3RoZXIgd2luZG93LiIKKyAgKGludGVyYWN0aXZlICJERGlyZWQgZGVz Y2VuZGVudCBkaXJzIG9mIGRpcmVjdG9yeTogIikKKyAgKGZpbmQtbGlzcC1maW5kLWRpcmVkLWlu dGVybmFsIGRpcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2ZpbmQtbGlzcC1m aWxlLXByZWRpY2F0ZS1pcy1kaXJlY3RvcnkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICdmaW5kLWxpc3AtZGVmYXVsdC1kaXJlY3RvcnktcHJlZGljYXRlCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiKkZpbmQgTGlzcCBEaXJlZCBTdWJkaXJlY3RvcmllcyoiCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnT1RIRVItV0lORE9XKSkKKwogOzsgTW9z dCBvZiB0aGlzIGlzIGxpZnRlZCBmcm9tIGZpbmQtZGlyZWQuZWwKIDs7CiAoZGVmdW4gZmluZC1s aXNwLWZpbmQtZGlyZWQtaW50ZXJuYWwgKGRpciBmaWxlLXByZWRpY2F0ZQotCQkJCQkgIGRpcmVj dG9yeS1wcmVkaWNhdGUgYnVmZmVyLW5hbWUpCi0gICJSdW4gZmluZCAoTGlzcCB2ZXJzaW9uKSBh bmQgZ28gaW50byBEaXJlZCBtb2RlIG9uIGEgYnVmZmVyIG9mIHRoZSBvdXRwdXQuIgotICAobGV0 ICgoZGlyZWQtYnVmZmVycyBkaXJlZC1idWZmZXJzKQotCShyZWdleHAgZmluZC1saXNwLXJlZ2V4 cCkpCi0gICAgOzsgRXhwYW5kIERJUiAoIiIgbWVhbnMgZGVmYXVsdC1kaXJlY3RvcnkpLCBhbmQg bWFrZSBzdXJlIGl0IGhhcyBhCi0gICAgOzsgdHJhaWxpbmcgc2xhc2guCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXJlY3RvcnktcHJlZGljYXRlIGJ1ZmZlci1u YW1lCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmb3B0aW9uYWwg b3RoZXItd2luZG93KQorICAiUnVuIExpc3AgdmVyc2lvbiBvZiBgZmluZCcsIHRoZW4gZGlyZWQg dGhlIHJlc3VsdC4iCisgIChsZXQgKChkaXJlZC1idWZmZXJzICBkaXJlZC1idWZmZXJzKQorICAg ICAgICAocmVnZXhwICAgICAgICAgZmluZC1saXNwLXJlZ2V4cCkpCisgICAgOzsgRXhwYW5kIERJ UiAoIiIgbWVhbnMgYGRlZmF1bHQtZGlyZWN0b3J5JyksIGVuc3VyaW5nIGEgdHJhaWxpbmcgc2xh c2guCiAgICAgKHNldHEgZGlyIChmaWxlLW5hbWUtYXMtZGlyZWN0b3J5IChleHBhbmQtZmlsZS1u YW1lIGRpcikpKQogICAgIDs7IENoZWNrIHRoYXQgaXQncyByZWFsbHkgYSBkaXJlY3RvcnkuCiAg ICAgKG9yIChmaWxlLWRpcmVjdG9yeS1wIGRpcikKIAkoZXJyb3IgImZpbmQtZGlyZWQgbmVlZHMg YSBkaXJlY3Rvcnk6ICVzIiBkaXIpKQotICAgIChvcgotICAgICAoYW5kIChidWZmZXItbmFtZSkK LQkgIChzdHJpbmc9IGJ1ZmZlci1uYW1lIChidWZmZXItbmFtZSkpKQotCShzd2l0Y2gtdG8tYnVm ZmVyIChnZXQtYnVmZmVyLWNyZWF0ZSBidWZmZXItbmFtZSkpKQorICAgICh1bmxlc3MgKGFuZCAo YnVmZmVyLW5hbWUpICAoc3RyaW5nPSBidWZmZXItbmFtZSAoYnVmZmVyLW5hbWUpKSkKKyAgICAg IChsZXQgKChidWYgIChnZXQtYnVmZmVyLWNyZWF0ZSBidWZmZXItbmFtZSkpKQorICAgICAgICAo aWYgb3RoZXItd2luZG93IChwb3AtdG8tYnVmZmVyIGJ1ZikgKHN3aXRjaC10by1idWZmZXIgYnVm KSkpKQogICAgICh3aWRlbikKICAgICAoa2lsbC1hbGwtbG9jYWwtdmFyaWFibGVzKQogICAgIChz ZXRxIGJ1ZmZlci1yZWFkLW9ubHkgbmlsKQpAQCAtMjc4LDEwICsyOTgsMTggQEAKICAgKHJldmVy dC1idWZmZXIpKQogCiAoZGVmdW4gZmluZC1saXNwLWZpbmQtZGlyZWQtaW5zZXJ0LWZpbGUgKGZp bGUgYnVmZmVyKQorICAiSW5zZXJ0IGxpbmUgZm9yIEZJTEUgaW4gQlVGRkVSLgorRklMRSBpcyBh IGZpbGUgb3IgYSBkaXJlY3RvcnkgbmFtZS4KK0lmIGBkaXJlZC1hY3R1YWwtc3dpdGNoZXMnIGlz IG5vbi1uaWwgaW4gQlVGRkVSIHRoZW4gcHJlc2VydmUgaXQuIgogICAoc2V0LWJ1ZmZlciBidWZm ZXIpCiAgIChpbnNlcnQgZmluZC1saXNwLWxpbmUtaW5kZW50Ci0JICAoZmluZC1saXNwLWZvcm1h dCBmaWxlIChmaWxlLWF0dHJpYnV0ZXMgZmlsZSAnc3RyaW5nKSAobGlzdCAiIikKLQkJCSAgKGN1 cnJlbnQtdGltZSkpKSkKKyAgICAgICAgICAoZmluZC1saXNwLWZvcm1hdAorICAgICAgICAgICAo cHJvcGVydGl6ZSBmaWxlICdkaXJlZC1maWxlbmFtZSB0KSAKKyAgICAgICAgICAgKGZpbGUtYXR0 cmlidXRlcyBmaWxlICdzdHJpbmcpCisgICAgICAgICAgIChvciAoYW5kIGRpcmVkLWFjdHVhbC1z d2l0Y2hlcworICAgICAgICAgICAgICAgICAgICAoc3BsaXQtc3RyaW5nLWFuZC11bnF1b3RlIGRp cmVkLWFjdHVhbC1zd2l0Y2hlcykpCisgICAgICAgICAgICAgICAobGlzdCAiIikpCisgICAgICAg ICAgIChjdXJyZW50LXRpbWUpKSkpCiAKIDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 Ozs7Ozs7OzsKIDs7IExpZnRlZCBmcm9tIGxzLWxpc3AuIFdlIGRvbid0IHdhbnQgdG8gcmVxdWly ZSBpdCwgYmVjYXVzZSB0aGF0CkBAIC0yODksMTUgKzMxNywxNCBAQAogOzs7Ozs7Ozs7Ozs7Ozs7 Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OwogCiAoZGVmdW4gZmluZC1saXNwLWZvcm1hdCAoZmls ZS1uYW1lIGZpbGUtYXR0ciBzd2l0Y2hlcyBub3cpCi0gICJGb3JtYXQgb25lIGxpbmUgb2YgbG9u ZyBscyBvdXRwdXQgZm9yIGZpbGUgRklMRS1OQU1FLgorICAiRm9ybWF0IG9uZSBsaW5lIG9mIGxv bmcgYGxzJyBvdXRwdXQgZm9yIGZpbGUgb3IgZGlyZWN0b3J5IEZJTEUtTkFNRS4KIEZJTEUtQVRU UiBhbmQgRklMRS1TSVpFIGdpdmUgdGhlIGZpbGUncyBhdHRyaWJ1dGVzIGFuZCBzaXplLgogU1dJ VENIRVMgYW5kIFRJTUUtSU5ERVggZ2l2ZSB0aGUgZnVsbCBzd2l0Y2ggbGlzdCBhbmQgdGltZSBk YXRhLiIKICAgKGxldCAoKGZpbGUtdHlwZSAoZmlsZS1hdHRyaWJ1dGUtdHlwZSBmaWxlLWF0dHIp KSkKLSAgICAoY29uY2F0IChpZiAobWVtcSA/aSBzd2l0Y2hlcykJOyBpbm9kZSBudW1iZXIKLQkJ KGZvcm1hdCAiJTZkICIgKGZpbGUtYXR0cmlidXRlLWlub2RlLW51bWJlciBmaWxlLWF0dHIpKSkK LQkgICAgOzsgbmlsIGlzIHRyZWF0ZWQgbGlrZSAiIiBpbiBjb25jYXQKLQkgICAgKGlmIChtZW1x ID9zIHN3aXRjaGVzKQk7IHNpemUgaW4gSwotCQkoZm9ybWF0ICIlNGQgIiAoMSsgKC8gKGZpbGUt YXR0cmlidXRlLXNpemUgZmlsZS1hdHRyKSAxMDI0KSkpKQorICAgIChjb25jYXQgKGFuZCAobWVt cSA/aSBzd2l0Y2hlcykJOyBpbm9kZSBudW1iZXIKKwkJIChmb3JtYXQgIiU2ZCAiIChmaWxlLWF0 dHJpYnV0ZS1pbm9kZS1udW1iZXIgZmlsZS1hdHRyKSkpCisJICAgIChhbmQgKG1lbXEgP3Mgc3dp dGNoZXMpCTsgc2l6ZSBpbiBLCisJCSAoZm9ybWF0ICIlNGQgIiAoMSsgKC8gKGZpbGUtYXR0cmli dXRlLXNpemUgZmlsZS1hdHRyKSAxMDI0KSkpKQogCSAgICAoZmlsZS1hdHRyaWJ1dGUtbW9kZXMg ZmlsZS1hdHRyKQogCSAgICAoZm9ybWF0ICIgJTNkICUtOHMgJS04cyAlOGQgIgogCQkgICAgKGZp bGUtYXR0cmlidXRlLWxpbmstbnVtYmVyIGZpbGUtYXR0cikKQEAgLTMxNCw5ICszNDEsMTAgQEAK IAkgICAgKGZpbmQtbGlzcC1mb3JtYXQtdGltZSBmaWxlLWF0dHIgc3dpdGNoZXMgbm93KQogCSAg ICAiICIKIAkgICAgZmlsZS1uYW1lCi0JICAgIChpZiAoc3RyaW5ncCBmaWxlLXR5cGUpCTsgaXMg YSBzeW1ib2xpYyBsaW5rCi0JCShjb25jYXQgIiAtPiAiIGZpbGUtdHlwZSkKLQkgICAgICAiIikK KyAgICAgICAgICAgIChhbmQgKGVxIHQgZmlsZS10eXBlKSAgKG1lbXEgP0Ygc3dpdGNoZXMpCisg ICAgICAgICAgICAgICAgICIvIikgICAgICAgICAgICAgICAgICA7IEFkZCBgLycgZm9yIGRpciBp ZiBgRicgc3dpdGNoCisJICAgIChhbmQgKHN0cmluZ3AgZmlsZS10eXBlKQorICAgICAgICAgICAg ICAgICAoY29uY2F0ICIgLT4gIiBmaWxlLXR5cGUpKSA7IEFkZCAiIC0+ICIgZm9yIHN5bWJvbGlj IGxpbmsKIAkgICAgIlxuIikpKQogCiAoZGVmdW4gZmluZC1saXNwLXRpbWUtaW5kZXggKHN3aXRj aGVzKQo= --_002_SJ0PR10MB548882B9FA3D91D90F08F8DDF3A69SJ0PR10MB5488namp_--