Commit 5ce36e81 authored by unknown's avatar unknown
Browse files

more refinement of IM patch to fix Windows pathnames with spaces 


server-tools/instance-manager/instance_options.cc:
  move declaration of end to start of function so gcc is happy
server-tools/instance-manager/parse_output.cc:
  remove space before =
  use my_isspace to determine if *end is white space
  remove comments related to get_word which was removed
  replace tab character with appropriate # of spaces
parent 69f80875

server-tools/instance-manager/instance_options.cc

+2 −1
Original line number Diff line number Diff line
@@ -334,12 +334,13 @@ int Instance_options::complete_initialization(const char *default_path, 
                                              uint instance_type)

{

  const char *tmp;

  char* end;



  if (!mysqld_path && !(mysqld_path= strdup_root(&alloc, default_path)))

    goto err;



  // it's safe to cast this to char* since this is a buffer we are allocating

  char* end= convert_dirname((char*)mysqld_path, mysqld_path, NullS);

  end= convert_dirname((char*)mysqld_path, mysqld_path, NullS);

  end[-1]= 0;



  mysqld_path_len= strlen(mysqld_path);

server-tools/instance-manager/parse_output.cc

+6 −8
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ void trim_space(const char **text, uint *word_len) 


  int len= strlen(start);

  const char* end= start + len - 1;

  while (end > start && (*end == ' ' || *end == '\r' || *end == '\n'))

  while (end > start && my_isspace(&my_charset_latin1, *end))

    end--;

  *word_len= (end - start)+1;

}
@@ -96,16 +96,14 @@ int parse_output_and_get_value(const char *command, const char *word, 
    linebuf[sizeof(linebuf) - 1]= '\0';        /* safety */



    /*

      Get the word, which might contain non-alphanumeric characters. (Usually

      these are '/', '-' and '.' in the path expressions and filenames)

      Compare the start of our line with the word(s) we are looking for.

    */

    if (!strncmp(word, linep, wordlen))

    {

      /*

        If we have found the word, return the next one (this is usually

        an option value) or the whole line (if flag)

        If we have found our word(s), then move linep past the word(s)

      */

      linep+= wordlen;                      /* swallow the previous one */

      linep+= wordlen;                      

      if (flag & GET_VALUE)

      {

        trim_space((const char**) &linep, &found_word_len);