From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LWYod-00072Y-Jb for mharc-grub-devel@gnu.org; Mon, 09 Feb 2009 11:16:59 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LWYoc-00071z-1j for grub-devel@gnu.org; Mon, 09 Feb 2009 11:16:58 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LWYob-00071i-De for grub-devel@gnu.org; Mon, 09 Feb 2009 11:16:57 -0500 Received: from [199.232.76.173] (port=56241 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LWYob-00071V-4n for grub-devel@gnu.org; Mon, 09 Feb 2009 11:16:57 -0500 Received: from fg-out-1718.google.com ([72.14.220.158]:39264) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LWYoa-0007ev-LU for grub-devel@gnu.org; Mon, 09 Feb 2009 11:16:56 -0500 Received: by fg-out-1718.google.com with SMTP id l27so1191569fgb.30 for ; Mon, 09 Feb 2009 08:16:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type; bh=PV0LhHoVI15zV4vc265QNh5NAiALXcgrXyk8C1cpa1M=; b=ksu4mnBHdIlq210Hji2qidH55aCwblE1aiE5+S1BLMQ9sm2yttenGnuDa1TFw0NoVX 0H49ne/uAXWH5XDOfI9ItVaxbGU+wdt7NH1aDGiqZDZ8ABJ8+sjU1UFg8xQt79VaBnvM m0W0TTrRT0UbKVbrx6Nmc4mgL7iIfaBgnUc8g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type; b=XUOqHPKDNcSPpBVpzg1K8wUk0nX2OrXyEPpMfUB0PHgtg8zSsAI3CQGvkYbo/n8vM+ RlUi6RkkVU3nPCI1EAj6pjIJmVa++JijJ9i1yRzQA9ZK8curt42zCxuOVZ94DPEVzzJX 0jFyxpBQ/ibieA8XLqIw4qeHRi+Df6koXq6tY= Received: by 10.86.31.18 with SMTP id e18mr681551fge.72.1234196214321; Mon, 09 Feb 2009 08:16:54 -0800 (PST) Received: from ?192.168.1.2? (166-87.3-85.cust.bluewin.ch [85.3.87.166]) by mx.google.com with ESMTPS id l12sm952919fgb.41.2009.02.09.08.16.53 (version=SSLv3 cipher=RC4-MD5); Mon, 09 Feb 2009 08:16:53 -0800 (PST) Message-ID: <499056F4.6000800@gmail.com> Date: Mon, 09 Feb 2009 17:16:52 +0100 From: phcoder User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: The development of GRUB 2 Content-Type: multipart/mixed; boundary="------------000306050103040707050103" X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: Bugfix: directories: not reported as such on case-insensitive fs X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Feb 2009 16:16:58 -0000 This is a multi-part message in MIME format. --------------000306050103040707050103 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Bugfix. Patch attached Vladimir 'phcoder' Serbinenko --------------000306050103040707050103 Content-Type: text/x-diff; name="hfspbf.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="hfspbf.diff" Index: fs/hfsplus.c =================================================================== --- fs/hfsplus.c (revision 1985) +++ fs/hfsplus.c (working copy) @@ -899,8 +899,8 @@ grub_fshelp_node_t node) { grub_free (node); - - if (filetype == GRUB_FSHELP_DIR) + + if ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR) return hook (filename, 1); else return hook (filename, 0); Index: ChangeLog =================================================================== --- ChangeLog (revision 1985) +++ ChangeLog (working copy) @@ -1,0 +1,8 @@ +2009-02-09 Vladimir Serbinenko + + Bugfix: directories not reported as such on case-insensitive hfs+ + + * include/grub/fshelp.h: included definition of GRUB_FSHELP_TYPE_MASK + and GRUB_FSHELP_FLAGS_MASK + * fs/hfsplus.c (grub_hfsplus_dir): ignore filetype flags + Index: include/grub/fshelp.h =================================================================== --- include/grub/fshelp.h (revision 1985) +++ include/grub/fshelp.h (working copy) @@ -27,6 +27,8 @@ typedef struct grub_fshelp_node *grub_fshelp_node_t; #define GRUB_FSHELP_CASE_INSENSITIVE 0x100 +#define GRUB_FSHELP_TYPE_MASK 0xff +#define GRUB_FSHELP_FLAGS_MASK 0x100 enum grub_fshelp_filetype { --------------000306050103040707050103--