← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
1144
1144
 
1145
1145
int main(int argc,char *argv[])
1146
1146
{
1147
 
  char buff[80];
1148
 
 
1149
1147
#if defined(ENABLE_NLS)
1150
1148
# if defined(HAVE_LOCALE_H)
1151
1149
  setlocale(LC_ALL, "");
1317
1315
      sprintf(histfile_tmp, "%s.TMP", histfile);
1318
1316
    }
1319
1317
  }
1320
 
  sprintf(buff, "%s",
1321
 
          _("Type 'help;' or '\\h' for help. Type '\\c' to clear the buffer.\n"));
1322
1318
 
1323
 
  put_info(buff,INFO_INFO,0,0);
 
1319
  put_info(_("Type 'help;' or '\\h' for help. "
 
1320
             "Type '\\c' to clear the buffer.\n"),INFO_INFO,0,0);
1324
1321
  status.exit_status= read_and_execute(!status.batch);
1325
1322
  if (opt_outfile)
1326
1323
    end_tee();
1986
1983
                        bool *ml_comment)
1987
1984
{
1988
1985
  unsigned char inchar;
1989
 
  char buff[80], *pos, *out;
 
1986
  char *pos, *out;
1990
1987
  COMMANDS *com;
1991
1988
  bool need_space= 0;
1992
1989
  bool ss_comment= 0;
2076
2073
      }
2077
2074
      else
2078
2075
      {
2079
 
        sprintf(buff,_("Unknown command '\\%c'."),inchar);
2080
 
        if (put_info(buff,INFO_ERROR,0,0) > 0)
 
2076
        string buff(_("Unknown command: "));
 
2077
        buff.push_back('\'');
 
2078
        buff.push_back(inchar);
 
2079
        buff.push_back('\'');
 
2080
        buff.push_back('.');
 
2081
        if (put_info(buff.c_str(),INFO_ERROR,0,0) > 0)
2081
2082
          return(1);
2082
2083
        *out++='\\';
2083
2084
        *out++=(char) inchar;