← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Lee Bieber
  • Date: 2010-11-13 03:25:56 UTC
  • mfrom: (1927.1.3 build)
  • Revision ID: kalebral@gmail.com-20101113032556-pl0emnrm3j7skdgv
Merge Andrew - fix bug 673988: random failures in flush_block_commit test
Merge Monty - remove unused files
Merge Andrew - fix bug 673552: drizzle client cannot load user config files

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
1397
1397
  system_config_dir_client.append("/drizzle/client.cnf");
1398
1398
 
1399
1399
  std::string user_config_dir((getenv("XDG_CONFIG_HOME")? getenv("XDG_CONFIG_HOME"):"~/.config"));
1400
 
  
 
1400
 
 
1401
  if (user_config_dir.compare(0, 2, "~/") == 0)
 
1402
  {
 
1403
    char *homedir;
 
1404
    homedir= getenv("HOME");
 
1405
    if (homedir != NULL)
 
1406
      user_config_dir.replace(0, 1, homedir);
 
1407
  }
 
1408
 
1401
1409
  po::variables_map vm;
1402
1410
 
1403
1411
  po::positional_options_description p;