Commit 82231c24 authored by unknown's avatar unknown
Browse files

post review fix 


mysys/default.c:
  cleanup + check for the last line in the file in "!include" directive processing
parent a40ecb48

mysys/default.c

+18 −9
Original line number Diff line number Diff line
@@ -418,15 +418,16 @@ static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, 


        /* trim trailing whitespace from directory name */

        end= ptr + strlen(ptr) - 1;

        /*

          This would work fine even if no whitespaces are met

          since fgets() stores the newline character in the buffer

        */

        /* fgets() stores the newline character in the buffer */

        if ((end[0] == '\n') || (end[0] == '\r') ||

            my_isspace(&my_charset_latin1, end[0]))

        {

          for (; my_isspace(&my_charset_latin1, *(end - 1)); end--)

          {}

          end[0]= 0;

        }



        /* print error msg if there is nothing after !inludedir directive */

        /* print error msg if there is nothing after !includedir directive */

        if (end == ptr)

        {

          fprintf(stderr,
@@ -444,7 +445,7 @@ static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, 
          search_file= search_dir->dir_entry + i;

          ext= fn_ext(search_file->name);



          /* check extenstion */

          /* check extension */

          for (tmp_ext= (char**) f_extensions; *tmp_ext; *tmp_ext++)

          {

            if (!strcmp(ext, *tmp_ext))
@@ -496,6 +497,14 @@ static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, 


      continue;

    }

    else

      if (recursion_level >= max_recursion_level)

      {

        fprintf(stderr,

                "warning: skipping !include directive as maximum include"

                "recursion level was reached in file %s at line %d\n",

                name, line);

      }



    if (*ptr == '[')				/* Group name */

    {