From f452b0404823d6b338ccc08bb2f355f4d9955080 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Mon, 13 Sep 2010 14:26:55 +0200 Subject: [PATCH] * grub-core/normal/completion.c (complete_file): Handle device containing slash. Fix based on patch by Doug Nazar. --- ChangeLog | 6 ++++++ grub-core/normal/completion.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4a6fefc15..8a51142a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-09-13 Vladimir Serbinenko + + * grub-core/normal/completion.c (complete_file): Handle device + containing slash. + Fix based on patch by Doug Nazar. + 2010-09-13 Vladimir Serbinenko grub-mknetdir script. diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c index 1b51dab3a..a1e86adb0 100644 --- 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) {