From unknown Thu Jun 19 14:28:38 2025 X-Loop: help-debbugs@gnu.org Subject: bug#22996: [PATCH] Use directory_files_internal_unwind() in directory_files_internal () Resent-From: Alexander Kuleshov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 12 Mar 2016 13:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 22996 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 22996@debbugs.gnu.org Cc: Alexander Kuleshov X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.145779060231429 (code B ref -1); Sat, 12 Mar 2016 13:51:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Mar 2016 13:50:02 +0000 Received: from localhost ([127.0.0.1]:45845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aejvd-0008Ak-Ix for submit@debbugs.gnu.org; Sat, 12 Mar 2016 08:50:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33599) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aejvc-0008AL-LR for submit@debbugs.gnu.org; Sat, 12 Mar 2016 08:50:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aejvW-0005i6-T1 for submit@debbugs.gnu.org; Sat, 12 Mar 2016 08:49:55 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:33881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aejvW-0005i2-Q5 for submit@debbugs.gnu.org; Sat, 12 Mar 2016 08:49:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aejvW-0008EC-0e for bug-gnu-emacs@gnu.org; Sat, 12 Mar 2016 08:49:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aejvS-0005hW-Qv for bug-gnu-emacs@gnu.org; Sat, 12 Mar 2016 08:49:53 -0500 Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]:34468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aejvS-0005h7-Ic for bug-gnu-emacs@gnu.org; Sat, 12 Mar 2016 08:49:50 -0500 Received: by mail-lb0-x22c.google.com with SMTP id xr8so183493369lbb.1 for ; Sat, 12 Mar 2016 05:49:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=d+dHhLfs0l93sRK2/uMwlu5Q6U0a0TL3UpnK/U2g6kc=; b=JCmpQAgctq+jV5/E50KcQ+d20vMJwHbV1c83YAJ9ZW66I88w/4JfbYB0YFcal7LNRS T30igQ1oaL7DeUiV7z9fY1I3yIdLfVhaUykmNYHN6MCMQC4Tu+ngFEiiX5J626L88nqt WYAWl/T+Fxxptzgx5z/82Ot+Yf0t7UxHmg49lzzlx+E9f8DWV2l32RMwFxt9VYk85XGh iGOUXyvm1Lb2399mvUQs21uEYI4VJLyTI3vncBEYuL4dA1is8FjREkNUEEWwyVAv3UWe SuKSOZnljapok7hVZ6ckhbeVmgrogyHz6dwnY5hH8rDhy2cPsVfwRgQ07lkBofyDp4JJ Senw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=d+dHhLfs0l93sRK2/uMwlu5Q6U0a0TL3UpnK/U2g6kc=; b=HG4B0eZITtsdVbJqNLYrvEV4W3hp3OBUjCt0iVtlTNySZxfUJjypm3sL5/atucJfGc eji+wmswO2sWY2+DNQc53d8av1ZGfQbVG0SR6Xh07kgNwzbHlSdwonlKZ0Jd7up2wkm+ NpktRyNO0L2eSfqWXWDv20ZHahKdVmFxI5vn6FHn9i59oU3ci+fE1ELOat76IBasIeoI F30cV0xJbWBPS+dEwY7ASfGl4VVLfc5SfOcPhoVftNFwOcJgFkBiPMcVuarPnWD2PGHu 1BLyPj4TAzLckxQmd3798ggeHdhlQcS+nd/0j4VbsF+/WrPLAMvYSfybHAKHnaJ4Fpy8 f8Mw== X-Gm-Message-State: AD7BkJJV/DLnO9p1mlq8me0Eb5dvmKWATv9JREZUSPv2oOa/l+2rmG2a4mM/+hI2zv1mhQ== X-Received: by 10.25.85.145 with SMTP id j139mr4864789lfb.131.1457790589141; Sat, 12 Mar 2016 05:49:49 -0800 (PST) Received: from localhost.localdomain.localhost ([178.90.42.203]) by smtp.gmail.com with ESMTPSA id f134sm2189143lff.34.2016.03.12.05.49.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Mar 2016 05:49:48 -0800 (PST) From: Alexander Kuleshov Date: Sat, 12 Mar 2016 19:49:37 +0600 Message-Id: <1457790577-14973-1-git-send-email-kuleshovmail@gmail.com> X-Mailer: git-send-email 2.8.0.rc0.61.g9f22707 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.4 (---) 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.4 (---) src/dired.c (directory_files_internal): use directory_files_internal_unwind() to prevent code duplication. --- src/dired.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/dired.c b/src/dired.c index ebc7029..b5b6af6 100644 --- a/src/dired.c +++ b/src/dired.c @@ -307,9 +307,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, } } - block_input (); - closedir (d); - unblock_input (); + directory_files_internal_unwind ((void*) d); #ifdef WINDOWSNT if (attrs) Vw32_get_true_file_attributes = w32_save; -- 2.8.0.rc0.61.g9f22707 From unknown Thu Jun 19 14:28:38 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: Alexander Kuleshov Subject: bug#22996: closed (Re: [PATCH] Use directory_files_internal_unwind() in directory_files_internal ()) Message-ID: References: <56EE0143.5010900@cs.ucla.edu> <1457790577-14973-1-git-send-email-kuleshovmail@gmail.com> X-Gnu-PR-Message: they-closed 22996 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 22996@debbugs.gnu.org Date: Sun, 20 Mar 2016 01:49:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1458438542-8145-1" This is a multi-part message in MIME format... ------------=_1458438542-8145-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #22996: [PATCH] Use directory_files_internal_unwind() in directory_files_in= ternal () which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 22996@debbugs.gnu.org. --=20 22996: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D22996 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1458438542-8145-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 22996-done) by debbugs.gnu.org; 20 Mar 2016 01:48:03 +0000 Received: from localhost ([127.0.0.1]:54044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ahSTL-000268-CT for submit@debbugs.gnu.org; Sat, 19 Mar 2016 21:48:03 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:60956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ahSTJ-00025d-Ov for 22996-done@debbugs.gnu.org; Sat, 19 Mar 2016 21:48:02 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id DD3E7161126; Sat, 19 Mar 2016 18:47:54 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id Tysg3qvmi6qJ; Sat, 19 Mar 2016 18:47:53 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 84EA3161203; Sat, 19 Mar 2016 18:47:53 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id WQHLXBWmZTwj; Sat, 19 Mar 2016 18:47:53 -0700 (PDT) Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 63704161126; Sat, 19 Mar 2016 18:47:53 -0700 (PDT) To: Alexander Kuleshov From: Paul Eggert Subject: Re: [PATCH] Use directory_files_internal_unwind() in directory_files_internal () Organization: UCLA Computer Science Department Message-ID: <56EE0143.5010900@cs.ucla.edu> Date: Sat, 19 Mar 2016 18:47:47 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------030208040005010105010605" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 22996-done Cc: 22996-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: -0.0 (/) This is a multi-part message in MIME format. --------------030208040005010105010605 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Thanks for pointing out the code infelicity. I installed the attached, which cleans it up in a more-general way. --------------030208040005010105010605 Content-Type: text/plain; charset=UTF-8; name="0001-No-need-to-block-input-when-reading-directories.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-No-need-to-block-input-when-reading-directories.txt" RnJvbSAxMDc3ZGFjMzAxNDZmY2M5YTAyZTNkZjllYTNhYjdkYTAyZGMwZDg3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBTYXQsIDE5IE1hciAyMDE2IDE4OjQ0OjE1IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gTm8gbmVlZCB0byBibG9jayBpbnB1dCB3aGVuIHJlYWRpbmcgZGlyZWN0b3JpZXMKTUlN RS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04 CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQKCiogc3JjL2RpcmVkLmM6IERvbuKA mXQgaW5jbHVkZSBibG9ja2lucHV0LmguCihvcGVuX2RpcmVjdG9yeSwgZGlyZWN0b3J5X2Zp bGVzX2ludGVybmFsX3Vud2luZCkKKGRpcmVjdG9yeV9maWxlc19pbnRlcm5hbCwgZmlsZV9h dHRyaWJ1dGVzKToKRG9u4oCZdCBibG9jayBpbnB1dCBoZXJlLCBhcyB0aGUgcmVhc29ucyBm b3IgYmxvY2tpbmcgaW5wdXQgc2hvdWxkCm5vIGxvbmdlciBhcHBseS4gIFNlZSBibG9ja2lu cHV0LmggRklYTUUuICAoQnVnIzIyOTk2KS4KLS0tCiBzcmMvZGlyZWQuYyB8IDE0ICstLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3NyYy9kaXJlZC5jIGIvc3JjL2RpcmVkLmMKaW5kZXggZWJj NzAyOS4uNWQwZTMyNyAxMDA2NDQKLS0tIGEvc3JjL2RpcmVkLmMKKysrIGIvc3JjL2RpcmVk LmMKQEAgLTQyLDcgKzQyLDYgQEAgYWxvbmcgd2l0aCBHTlUgRW1hY3MuICBJZiBub3QsIHNl ZSA8aHR0cDovL3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uICAqLwogI2luY2x1ZGUgImJ1ZmZl ci5oIgogI2luY2x1ZGUgImNvZGluZy5oIgogI2luY2x1ZGUgInJlZ2V4LmgiCi0jaW5jbHVk ZSAiYmxvY2tpbnB1dC5oIgogCiAjaWZkZWYgTVNET1MKICNpbmNsdWRlICJtc2Rvcy5oIgkv KiBmb3IgZnN0YXRhdCAqLwpAQCAtNjksOCArNjgsNiBAQCBvcGVuX2RpcmVjdG9yeSAoTGlz cF9PYmplY3QgZGlybmFtZSwgaW50ICpmZHApCiAgIERJUiAqZDsKICAgaW50IGZkLCBvcGVu ZGlyX2Vycm5vOwogCi0gIGJsb2NrX2lucHV0ICgpOwotCiAjaWZkZWYgRE9TX05UCiAgIC8q IERpcmVjdG9yaWVzIGNhbm5vdCBiZSBvcGVuZWQuICBUaGUgZW11bGF0aW9uIGFzc3VtZXMg dGhhdCBhbnkKICAgICAgZmlsZSBkZXNjcmlwdG9yIG90aGVyIHRoYW4gQVRfRkRDV0QgY29y cmVzcG9uZHMgdG8gdGhlIG1vc3QKQEAgLTk0LDggKzkxLDYgQEAgb3Blbl9kaXJlY3Rvcnkg KExpc3BfT2JqZWN0IGRpcm5hbWUsIGludCAqZmRwKQogICAgIH0KICNlbmRpZgogCi0gIHVu YmxvY2tfaW5wdXQgKCk7Ci0KICAgaWYgKCFkKQogICAgIHJlcG9ydF9maWxlX2Vycm5vICgi T3BlbmluZyBkaXJlY3RvcnkiLCBkaXJuYW1lLCBvcGVuZGlyX2Vycm5vKTsKICAgKmZkcCA9 IGZkOwpAQCAtMTExLDEyICsxMDYsOSBAQCBkaXJlY3RvcnlfZmlsZXNfaW50ZXJuYWxfdzMy X3Vud2luZCAoTGlzcF9PYmplY3QgYXJnKQogI2VuZGlmCiAKIHN0YXRpYyB2b2lkCi1kaXJl Y3RvcnlfZmlsZXNfaW50ZXJuYWxfdW53aW5kICh2b2lkICpkaCkKK2RpcmVjdG9yeV9maWxl c19pbnRlcm5hbF91bndpbmQgKHZvaWQgKmQpCiB7Ci0gIERJUiAqZCA9IGRoOwotICBibG9j a19pbnB1dCAoKTsKICAgY2xvc2VkaXIgKGQpOwotICB1bmJsb2NrX2lucHV0ICgpOwogfQog CiAvKiBSZXR1cm4gdGhlIG5leHQgZGlyZWN0b3J5IGVudHJ5IGZyb20gRElSOyBESVIncyBu YW1lIGlzIERJUk5BTUUuCkBAIC0zMDcsOSArMjk5LDcgQEAgZGlyZWN0b3J5X2ZpbGVzX2lu dGVybmFsIChMaXNwX09iamVjdCBkaXJlY3RvcnksIExpc3BfT2JqZWN0IGZ1bGwsCiAJfQog ICAgIH0KIAotICBibG9ja19pbnB1dCAoKTsKICAgY2xvc2VkaXIgKGQpOwotICB1bmJsb2Nr X2lucHV0ICgpOwogI2lmZGVmIFdJTkRPV1NOVAogICBpZiAoYXR0cnMpCiAgICAgVnczMl9n ZXRfdHJ1ZV9maWxlX2F0dHJpYnV0ZXMgPSB3MzJfc2F2ZTsKQEAgLTk1OSwxMCArOTQ5LDgg QEAgZmlsZV9hdHRyaWJ1dGVzIChpbnQgZmQsIGNoYXIgY29uc3QgKm5hbWUsIExpc3BfT2Jq ZWN0IGlkX2Zvcm1hdCkKIAogICBpZiAoIShOSUxQIChpZF9mb3JtYXQpIHx8IEVRIChpZF9m b3JtYXQsIFFpbnRlZ2VyKSkpCiAgICAgewotICAgICAgYmxvY2tfaW5wdXQgKCk7CiAgICAg ICB1bmFtZSA9IHN0YXRfdW5hbWUgKCZzKTsKICAgICAgIGduYW1lID0gc3RhdF9nbmFtZSAo JnMpOwotICAgICAgdW5ibG9ja19pbnB1dCAoKTsKICAgICB9CiAKICAgZmlsZW1vZGVzdHJp bmcgKCZzLCBtb2Rlcyk7Ci0tIAoyLjUuMAoK --------------030208040005010105010605-- ------------=_1458438542-8145-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 12 Mar 2016 13:50:02 +0000 Received: from localhost ([127.0.0.1]:45845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aejvd-0008Ak-Ix for submit@debbugs.gnu.org; Sat, 12 Mar 2016 08:50:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33599) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aejvc-0008AL-LR for submit@debbugs.gnu.org; Sat, 12 Mar 2016 08:50:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aejvW-0005i6-T1 for submit@debbugs.gnu.org; Sat, 12 Mar 2016 08:49:55 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:33881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aejvW-0005i2-Q5 for submit@debbugs.gnu.org; Sat, 12 Mar 2016 08:49:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aejvW-0008EC-0e for bug-gnu-emacs@gnu.org; Sat, 12 Mar 2016 08:49:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aejvS-0005hW-Qv for bug-gnu-emacs@gnu.org; Sat, 12 Mar 2016 08:49:53 -0500 Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]:34468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aejvS-0005h7-Ic for bug-gnu-emacs@gnu.org; Sat, 12 Mar 2016 08:49:50 -0500 Received: by mail-lb0-x22c.google.com with SMTP id xr8so183493369lbb.1 for ; Sat, 12 Mar 2016 05:49:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=d+dHhLfs0l93sRK2/uMwlu5Q6U0a0TL3UpnK/U2g6kc=; b=JCmpQAgctq+jV5/E50KcQ+d20vMJwHbV1c83YAJ9ZW66I88w/4JfbYB0YFcal7LNRS T30igQ1oaL7DeUiV7z9fY1I3yIdLfVhaUykmNYHN6MCMQC4Tu+ngFEiiX5J626L88nqt WYAWl/T+Fxxptzgx5z/82Ot+Yf0t7UxHmg49lzzlx+E9f8DWV2l32RMwFxt9VYk85XGh iGOUXyvm1Lb2399mvUQs21uEYI4VJLyTI3vncBEYuL4dA1is8FjREkNUEEWwyVAv3UWe SuKSOZnljapok7hVZ6ckhbeVmgrogyHz6dwnY5hH8rDhy2cPsVfwRgQ07lkBofyDp4JJ Senw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=d+dHhLfs0l93sRK2/uMwlu5Q6U0a0TL3UpnK/U2g6kc=; b=HG4B0eZITtsdVbJqNLYrvEV4W3hp3OBUjCt0iVtlTNySZxfUJjypm3sL5/atucJfGc eji+wmswO2sWY2+DNQc53d8av1ZGfQbVG0SR6Xh07kgNwzbHlSdwonlKZ0Jd7up2wkm+ NpktRyNO0L2eSfqWXWDv20ZHahKdVmFxI5vn6FHn9i59oU3ci+fE1ELOat76IBasIeoI F30cV0xJbWBPS+dEwY7ASfGl4VVLfc5SfOcPhoVftNFwOcJgFkBiPMcVuarPnWD2PGHu 1BLyPj4TAzLckxQmd3798ggeHdhlQcS+nd/0j4VbsF+/WrPLAMvYSfybHAKHnaJ4Fpy8 f8Mw== X-Gm-Message-State: AD7BkJJV/DLnO9p1mlq8me0Eb5dvmKWATv9JREZUSPv2oOa/l+2rmG2a4mM/+hI2zv1mhQ== X-Received: by 10.25.85.145 with SMTP id j139mr4864789lfb.131.1457790589141; Sat, 12 Mar 2016 05:49:49 -0800 (PST) Received: from localhost.localdomain.localhost ([178.90.42.203]) by smtp.gmail.com with ESMTPSA id f134sm2189143lff.34.2016.03.12.05.49.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Mar 2016 05:49:48 -0800 (PST) From: Alexander Kuleshov To: bug-gnu-emacs@gnu.org Subject: [PATCH] Use directory_files_internal_unwind() in directory_files_internal () Date: Sat, 12 Mar 2016 19:49:37 +0600 Message-Id: <1457790577-14973-1-git-send-email-kuleshovmail@gmail.com> X-Mailer: git-send-email 2.8.0.rc0.61.g9f22707 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.4 (---) X-Debbugs-Envelope-To: submit Cc: Alexander Kuleshov 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.4 (---) src/dired.c (directory_files_internal): use directory_files_internal_unwind() to prevent code duplication. --- src/dired.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/dired.c b/src/dired.c index ebc7029..b5b6af6 100644 --- a/src/dired.c +++ b/src/dired.c @@ -307,9 +307,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, } } - block_input (); - closedir (d); - unblock_input (); + directory_files_internal_unwind ((void*) d); #ifdef WINDOWSNT if (attrs) Vw32_get_true_file_attributes = w32_save; -- 2.8.0.rc0.61.g9f22707 ------------=_1458438542-8145-1--