Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Kisb0-0000YZ-A9 for mharc-grub-devel@gnu.org; Thu, 25 Sep 2008 11:17:34 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kisay-0000WX-BX for grub-devel@gnu.org; Thu, 25 Sep 2008 11:17:32 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kisaw-0000VC-NF for grub-devel@gnu.org; Thu, 25 Sep 2008 11:17:31 -0400 Received: from [199.232.76.173] (port=40579 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kisaw-0000V2-Jq for grub-devel@gnu.org; Thu, 25 Sep 2008 11:17:30 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:61185) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Kisaw-0005mw-9Q for grub-devel@gnu.org; Thu, 25 Sep 2008 11:17:30 -0400 Received: from [85.180.15.102] (e180015102.adsl.alicedsl.de [85.180.15.102]) by mrelayeu.kundenserver.de (node=mrelayeu4) with ESMTP (Nemesis) id 0ML21M-1KisaZ1Zxa-0007v0; Thu, 25 Sep 2008 17:17:07 +0200 From: Felix Zielcke To: The development of GRUB 2 Content-Type: multipart/mixed; boundary="=-yg/jDhVNs1/5jh5Ih9uh" Date: Thu, 25 Sep 2008 17:17:06 +0200 Message-Id: <1222355826.4395.7.camel@fz.local> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 X-Provags-ID: V01U2FsdGVkX19crM8Wr6cfBnRiDwxQqmg64VDA25f3NIHgwKL 4+sT9rWmcNmo6QBidPqdfsJO2v0XMcHS8NpP6mHP4iXan7vN99 WhL33m4dQSzBm/Gp7f7e5B7oHjm826X X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [PATCH] treat multiple slashes like one for JFS 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: Thu, 25 Sep 2008 15:17:32 -0000 --=-yg/jDhVNs1/5jh5Ih9uh Content-Type: text/plain Content-Transfer-Encoding: 7bit Here's a patch to handle things like //boot/// for JFS which doestn't do it currently but Linux does it. This was already brought up 2004 but I wonder why this isn't included http://lists.gnu.org/archive/html/grub-devel/2004-08/msg00043.html Probable this can be right now commited but as always I just want to be on the safe side. --=-yg/jDhVNs1/5jh5Ih9uh Content-Disposition: attachment; filename=jfs.diff Content-Type: text/x-patch; name=jfs.diff; charset=UTF-8 Content-Transfer-Encoding: 7bit 2008-09-25 Felix Zielcke fs/jfs.c (grub_jfs_find_file): Treat multiple slashes like one. Index: fs/jfs.c =================================================================== --- fs/jfs.c (revision 1877) +++ fs/jfs.c (working copy) @@ -614,8 +614,8 @@ grub_jfs_find_file (struct grub_jfs_data if (grub_jfs_read_inode (data, GRUB_JFS_AGGR_INODE, &data->currinode)) return grub_errno; - /* Skip the first slash. */ - if (name[0] == '/') + /* Skip the first slashes. */ + while (*name == '/') { name++; if (!*name) @@ -626,10 +626,12 @@ grub_jfs_find_file (struct grub_jfs_data next = grub_strchr (name, '/'); if (next) { - next[0] = '\0'; - next++; + while (*next == '/') + { + next[0] = '\0'; + next++; + } } - diro = grub_jfs_opendir (data, &data->currinode); if (!diro) return grub_errno; --=-yg/jDhVNs1/5jh5Ih9uh--