Commit 897b7cbd authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
parents 32c3009d 45f941cb

ndb/src/common/logger/LogHandler.cpp

+3 −4
Original line number Diff line number Diff line
@@ -117,10 +117,9 @@ LogHandler::parseParams(const BaseString &_params) { 
  _params.split(v_args, ",");

  for(size_t i=0; i < v_args.size(); i++) {

    Vector<BaseString> v_param_value;



    v_args[i].split(v_param_value, "=", 2);

    if(v_param_value.size() == 2 &&

       !setParam(v_param_value[0], v_param_value[1]))

    if(v_args[i].split(v_param_value, "=", 2) != 2)

      ret = false;

    else if (!setParam(v_param_value[0], v_param_value[1]))

      ret = false;

  }

ndb/src/common/logger/Logger.cpp

+6 −3
Original line number Diff line number Diff line
@@ -169,10 +169,13 @@ Logger::addHandler(const BaseString &logstring) { 
  size_t i;

  Vector<BaseString> logdest;

  Vector<LogHandler *>loghandlers;

  DBUG_ENTER("Logger::addHandler");



  logstring.split(logdest, ";");



  for(i = 0; i < logdest.size(); i++) {

    DBUG_PRINT("info",("adding: %s",logdest[i]));



    Vector<BaseString> v_type_args;

    logdest[i].split(v_type_args, ":", 2);
@@ -191,16 +194,16 @@ Logger::addHandler(const BaseString &logstring) { 
      handler = new ConsoleLogHandler();



    if(handler == NULL)

      return false;

      DBUG_RETURN(false);

    if(!handler->parseParams(params))

      return false;

      DBUG_RETURN(false);

    loghandlers.push_back(handler);

  }

  

  for(i = 0; i < loghandlers.size(); i++)

    addHandler(loghandlers[i]);

  

  return true; /* @todo handle errors */

  DBUG_RETURN(true); /* @todo handle errors */

}



bool

ndb/src/mgmsrv/InitConfigFileParser.cpp

+24 −44
Original line number Diff line number Diff line
@@ -213,48 +213,41 @@ InitConfigFileParser::parseConfig(FILE * file) { 
//  Parse Name-Value Pair

//****************************************************************************



bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) {



  char tmpLine[MAX_LINE_LENGTH];

  char fname[MAX_LINE_LENGTH], rest[MAX_LINE_LENGTH];

  char* t;

  const char *separator_list[]= {":", "=", 0};

  const char *separator= 0;



bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line)

{

  if (ctx.m_currentSection == NULL){

    ctx.reportError("Value specified outside section");

    return false;

  }



  strncpy(tmpLine, line, MAX_LINE_LENGTH);



  // *************************************

  //  Check if a separator exists in line 

  //  Split string at first occurrence of 

  //  '=' or ':'

  // *************************************

  for(int i= 0; separator_list[i] != 0; i++) {

    if(strchr(tmpLine, separator_list[i][0])) {

      separator= separator_list[i];

      break;

    }

  }



  if (separator == 0) {

  Vector<BaseString> tmp_string_split;

  if (BaseString(line).split(tmp_string_split,

			     BaseString("=:"),

			     2) != 2)

  {

    ctx.reportError("Parse error");

    return false;

  }



  // *******************************************

  //  Get pointer to substring before separator

  // *******************************************

  t = strtok(tmpLine, separator);



  // *****************************************

  //  Count number of tokens before separator

  // *****************************************

  if (sscanf(t, "%120s%120s", fname, rest) != 1) {

    ctx.reportError("Multiple names before \'%c\'", separator[0]);

    return false;

  // *************************************

  // Remove leading and trailing chars

  // *************************************

  {

    for (int i = 0; i < 2; i++)

      tmp_string_split[i].trim("\r\n \t"); 

  }



  // *************************************

  // First in split is fname

  // *************************************



  const char *fname= tmp_string_split[0].c_str();



  if (!ctx.m_currentInfo->contains(fname)) {

    ctx.reportError("[%s] Unknown parameter: %s", ctx.fname, fname);

    return false;
@@ -273,24 +266,11 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) { 
    } 

  }



  // ******************************************

  //  Get pointer to substring after separator 

  // ******************************************

  t = strtok(NULL, "\0");

  if (t == NULL) {

    ctx.reportError("No value for parameter");

    return false;

  }



  // ******************************************

  //  Remove prefix and postfix spaces and tabs

  // *******************************************

  trim(t);



  // ***********************

  //  Store name-value pair

  // ***********************

  return storeNameValuePair(ctx, fname, t);



  return storeNameValuePair(ctx, fname, tmp_string_split[1].c_str());

}