From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alexander Kuleshov Newsgroups: gmane.emacs.bugs Subject: bug#22996: [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> NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1457790686 14459 80.91.229.3 (12 Mar 2016 13:51:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Mar 2016 13:51:26 +0000 (UTC) Cc: Alexander Kuleshov To: 22996@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Mar 12 14:51:12 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aejwk-0003Lz-0R for geb-bug-gnu-emacs@m.gmane.org; Sat, 12 Mar 2016 14:51:10 +0100 Original-Received: from localhost ([::1]:60410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aejwj-0008QH-6X for geb-bug-gnu-emacs@m.gmane.org; Sat, 12 Mar 2016 08:51:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aejwf-0008Pi-Ag for bug-gnu-emacs@gnu.org; Sat, 12 Mar 2016 08:51:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aejwc-0005qg-3j for bug-gnu-emacs@gnu.org; Sat, 12 Mar 2016 08:51:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48718) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aejwc-0005qb-0Q for bug-gnu-emacs@gnu.org; Sat, 12 Mar 2016 08:51:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aejwb-0008C6-Ru for bug-gnu-emacs@gnu.org; Sat, 12 Mar 2016 08:51:01 -0500 X-Loop: help-debbugs@gnu.org 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 X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.145779060231429 (code B ref -1); Sat, 12 Mar 2016 13:51:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 Mar 2016 13:50:02 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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) Original-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) 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:114824 Archived-At: 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