archelp: Fix handling of dot and dotdot at the end of the name.

Fixes cpio_test and tar_test.

diff --git a/grub-core/fs/archelp.c b/grub-core/fs/archelp.c
index c85cbfac29ebbdce8938e6dbb62930cb9f3ef00b..707f9a658d5ed542aed4788a9a6def6bccf985a1 100644 (file)
--- a/grub-core/fs/archelp.c
+++ b/grub-core/fs/archelp.c
@@ -34,12 +34,12 @@ canonicalize (char *name)
        iptr++;
       if (iptr[0] == '.' && (iptr[1] == '/' || iptr[1] == 0))
        {
-         iptr += 2;
+         iptr++;
          continue;
        }
       if (iptr[0] == '.' && iptr[1] == '.' && (iptr[2] == '/' || iptr[2] == 0))
        {
-         iptr += 3;
+         iptr += 2;
          if (optr == name)
            continue;
          for (optr -= 2; optr >= name && *optr != '/'; optr--);