* grub-core/normal/completion.c (complete_file): Handle device

	containing slash.
	Fix based on patch by Doug Nazar.

diff --git a/ChangeLog b/ChangeLog
index 4a6fefc15a4f0d3ab78f04f5ba0ad9e0a884a4d5..8a51142a956cacc3071539dc5f41bee808cb517e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/normal/completion.c (complete_file): Handle device
+       containing slash.
+       Fix based on patch by Doug Nazar.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        grub-mknetdir script.

diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
index 1b51dab3aa77ecc569e5db13a0c5c1192fe7f6f0..a1e86adb01a9a43b61524d02f25c7d9cc51474ab 100644 (file)
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -247,7 +247,8 @@ complete_file (void)
       goto fail;
     }
 
-  dir = grub_strchr (current_word, '/');
+  dir = grub_strchr (current_word + (device ? 2 + grub_strlen (device) : 0),
+                    '/');
   last_dir = grub_strrchr (current_word, '/');
   if (dir)
     {