mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
11099ed53c
Fix the way that instance manager finds the version number of instances, so that it works properly when the executable name isn't the same as what the instance-manager launched, such as when wrapping a libtool-wrapped executable from the source tree. This removes the 'Ver ' reported in the version column output by 'SHOW INSTANCE STATUS ...', but the format of this column is not documented (and is pretty free-form to begin with). server-tools/instance-manager/instance_options.cc: Look for 'Ver' to get version from running mysqld --version server-tools/instance-manager/parse_output.cc: Make parse_output_and_get_value() look at the whole line to find the word, instead of just at the beginning of each line. sql/mysqld.cc: Note that the instance manager relies on 'Ver' in mysqld --version
127 lines
3.5 KiB
C++
127 lines
3.5 KiB
C++
/* Copyright (C) 2004 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include <my_global.h>
|
|
#include "parse.h"
|
|
#include "parse_output.h"
|
|
|
|
#include <stdio.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include "portability.h"
|
|
|
|
|
|
void trim_space(const char **text, uint *word_len)
|
|
{
|
|
const char *start= *text;
|
|
while (*start != 0 && *start == ' ')
|
|
start++;
|
|
*text= start;
|
|
|
|
int len= strlen(start);
|
|
const char *end= start + len - 1;
|
|
while (end > start && my_isspace(&my_charset_latin1, *end))
|
|
end--;
|
|
*word_len= (end - start)+1;
|
|
}
|
|
|
|
/*
|
|
Parse output of the given command
|
|
|
|
SYNOPSYS
|
|
parse_output_and_get_value()
|
|
|
|
command the command to execue with popen.
|
|
word the word to look for (usually an option name)
|
|
result the buffer to store the next word (option value)
|
|
input_buffer_len self-explanatory
|
|
flag this equals to GET_LINE if we want to get all the line after
|
|
the matched word and GET_VALUE otherwise.
|
|
|
|
DESCRIPTION
|
|
|
|
Parse output of the "command". Find the "word" and return the next one
|
|
if flag is GET_VALUE. Return the rest of the parsed string otherwise.
|
|
|
|
RETURN
|
|
0 - ok, the word has been found
|
|
1 - error occured or the word is not found
|
|
*/
|
|
|
|
int parse_output_and_get_value(const char *command, const char *word,
|
|
char *result, size_t input_buffer_len,
|
|
uint flag)
|
|
{
|
|
FILE *output;
|
|
uint wordlen;
|
|
/* should be enough to store the string from the output */
|
|
enum { MAX_LINE_LEN= 512 };
|
|
char linebuf[MAX_LINE_LEN];
|
|
int rc= 1;
|
|
|
|
wordlen= strlen(word);
|
|
|
|
/*
|
|
Successful return of popen does not tell us whether the command has been
|
|
executed successfully: if the command was not found, we'll get EOF
|
|
when reading the output buffer below.
|
|
*/
|
|
if (!(output= popen(command, "r")))
|
|
goto err;
|
|
|
|
/*
|
|
We want fully buffered stream. We also want system to
|
|
allocate appropriate buffer.
|
|
*/
|
|
setvbuf(output, NULL, _IOFBF, 0);
|
|
|
|
while (fgets(linebuf, sizeof(linebuf) - 1, output))
|
|
{
|
|
uint found_word_len= 0;
|
|
char *linep= linebuf;
|
|
|
|
linebuf[sizeof(linebuf) - 1]= '\0'; /* safety */
|
|
|
|
/*
|
|
Find the word(s) we are looking for in the line
|
|
*/
|
|
if ((linep= strstr(linep, word)))
|
|
{
|
|
/*
|
|
If we have found our word(s), then move linep past the word(s)
|
|
*/
|
|
linep+= wordlen;
|
|
if (flag & GET_VALUE)
|
|
{
|
|
trim_space((const char**) &linep, &found_word_len);
|
|
if (input_buffer_len <= found_word_len)
|
|
goto err;
|
|
strmake(result, linep, found_word_len);
|
|
}
|
|
else /* currently there are only two options */
|
|
strmake(result, linep, input_buffer_len - 1);
|
|
rc= 0;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* we are not interested in the termination status */
|
|
pclose(output);
|
|
|
|
err:
|
|
return rc;
|
|
}
|
|
|