* grub-core/fs/fshelp.c: Remove variable length arrays.

	Reduces fshelp.mod by 116 bytes (23 compressed).

diff --git a/ChangeLog b/ChangeLog
index fc5ee0b7779505b71d27772fec74c86271737f9f..91f4c0f8e4794c69ca248a12430fdf71e72bff73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/fshelp.c: Remove variable length arrays.
+       Reduces fshelp.mod by 116 bytes (23 compressed).
+
 2013-10-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/normal/completion.c: Remove variable length arrays.

diff --git a/grub-core/fs/fshelp.c b/grub-core/fs/fshelp.c
index 6d6e71e703288c992acbd0f24a8d694c8fb018ec..c6f3fe1dfaa8e6d937ef6dacee34860716840bfd 100644 (file)
--- a/grub-core/fs/fshelp.c
+++ b/grub-core/fs/fshelp.c
@@ -39,7 +39,8 @@ struct grub_fshelp_find_file_ctx
   grub_fshelp_node_t rootnode, currroot, currnode, oldnode;
   enum grub_fshelp_filetype foundtype;
   int symlinknest;
-  char *name;
+  const char *name;
+  const char *next;
   enum grub_fshelp_filetype type;
 };
 
@@ -59,9 +60,10 @@ find_file_iter (const char *filename, enum grub_fshelp_filetype filetype,
   struct grub_fshelp_find_file_ctx *ctx = data;
 
   if (filetype == GRUB_FSHELP_UNKNOWN ||
-      (grub_strcmp (ctx->name, filename) &&
-       (! (filetype & GRUB_FSHELP_CASE_INSENSITIVE) ||
-       grub_strcasecmp (ctx->name, filename))))
+      ((filetype & GRUB_FSHELP_CASE_INSENSITIVE)
+       ? grub_strncasecmp (ctx->name, filename, ctx->next - ctx->name)
+       : grub_strncmp (ctx->name, filename, ctx->next - ctx->name))
+      || filename[ctx->next - ctx->name])
     {
       grub_free (node);
       return 0;
@@ -81,40 +83,31 @@ find_file (const char *currpath, grub_fshelp_node_t currroot,
           iterate_dir_func iterate_dir, read_symlink_func read_symlink,
           struct grub_fshelp_find_file_ctx *ctx)
 {
-  char fpath[grub_strlen (currpath) + 1];
-  char *next;
-
   ctx->currroot = currroot;
-  ctx->name = fpath;
+  ctx->name = currpath;
   ctx->type = GRUB_FSHELP_DIR;
   ctx->currnode = currroot;
   ctx->oldnode = currroot;
 
-  grub_strncpy (fpath, currpath, grub_strlen (currpath) + 1);
-
-  /* Remove all leading slashes.  */
-  while (*ctx->name == '/')
-    ctx->name++;
-
-  if (! *ctx->name)
-    {
-      *currfound = ctx->currnode;
-      return 0;
-    }
-
   for (;;)
     {
       int found;
 
-      /* Extract the actual part from the pathname.  */
-      next = grub_strchr (ctx->name, '/');
-      if (next)
+      /* Remove all leading slashes.  */
+      while (*ctx->name == '/')
+       ctx->name++;
+
+      /* Found the node!  */
+      if (! *ctx->name)
        {
-         /* Remove all leading slashes.  */
-         while (*next == '/')
-           *(next++) = '\0';
+         *currfound = ctx->currnode;
+         ctx->foundtype = ctx->type;
+         return 0;
        }
 
+      /* Extract the actual part from the pathname.  */
+      for (ctx->next = ctx->name; *ctx->next && *ctx->next != '/'; ctx->next++);
+
       /* At this point it is expected that the current node is a
         directory, check if this is true.  */
       if (ctx->type != GRUB_FSHELP_DIR)
@@ -190,15 +183,7 @@ find_file (const char *currpath, grub_fshelp_node_t currroot,
          ctx->oldnode = 0;
        }
 
-      /* Found the node!  */
-      if (! next || *next == '\0')
-       {
-         *currfound = ctx->currnode;
-         ctx->foundtype = ctx->type;
-         return 0;
-       }
-
-      ctx->name = next;
+      ctx->name = ctx->next;
     }
 
   return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"),