← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/archive/archive_reader.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:
plugin/archive/archive_reader.cc
91
91
  system_config_dir_archive_reader.append("/drizzle/archive_reader.cnf");
92
92
 
93
93
  std::string user_config_dir((getenv("XDG_CONFIG_HOME")? getenv("XDG_CONFIG_HOME"):"~/.config"));
 
94
 
 
95
  if (user_config_dir.compare(0, 2, "~/") == 0)
 
96
  {
 
97
    char *homedir;
 
98
    homedir= getenv("HOME");
 
99
    if (homedir != NULL)
 
100
      user_config_dir.replace(0, 1, homedir);
 
101
  }
94
102
  
95
103
  po::options_description long_options("Allowed Options");
96
104
  long_options.add(commandline_options).add(archive_reader_options);