Merge lp:~vjsamuel/drizzle/new-config-file-system into lp:~drizzle-trunk/drizzle/development

[Vijay Samuel]

[Monty Taylor (mordred)]

Looks great. Thanks for fixing that for me!

review: Approve

=== modified file 'client/drizzle.cc'
--- client/drizzle.cc	2010-06-19 16:36:52 +0000
+++ client/drizzle.cc	2010-07-30 19:39:47 +0000
@@ -9,7 +9,7 @@
  *  (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
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty ofm
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
@@ -65,6 +65,7 @@
 #include <sys/ioctl.h>
 #include <drizzled/configmake.h>
 #include "drizzled/utf8/utf8.h"
+#include <cstdlib>
 
 #if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
 #include <curses.h>
@@ -1488,6 +1489,8 @@
   std::string system_config_dir_client(SYSCONFDIR); 
   system_config_dir_client.append("/drizzle/client.cnf");
 
+  std::string user_config_dir((getenv("XDG_CONFIG_HOME")? getenv("XDG_CONFIG_HOME"):"~/.config"));
+  
   po::variables_map vm;
 
   po::positional_options_description p;
@@ -1498,14 +1501,20 @@
 
   if (! vm["no-defaults"].as<bool>())
   {
-    ifstream user_drizzle_ifs("~/.drizzle/drizzle.cnf");
+    std::string user_config_dir_drizzle(user_config_dir);
+    user_config_dir_drizzle.append("/drizzle/drizzle.cnf"); 
+
+    std::string user_config_dir_client(user_config_dir);
+    user_config_dir_client.append("/drizzle/client.cnf");
+
+    ifstream user_drizzle_ifs(user_config_dir_drizzle.c_str());
     po::store(parse_config_file(user_drizzle_ifs, drizzle_options), vm);
- 
+
+    ifstream user_client_ifs(user_config_dir_client.c_str());
+    po::store(parse_config_file(user_client_ifs, client_options), vm);
+
     ifstream system_drizzle_ifs(system_config_dir_drizzle.c_str());
     store(parse_config_file(system_drizzle_ifs, drizzle_options), vm);
-
-    ifstream user_client_ifs("~/.drizzle/client.cnf");
-    po::store(parse_config_file(user_client_ifs, client_options), vm);
  
     ifstream system_client_ifs(system_config_dir_client.c_str());
     po::store(parse_config_file(system_client_ifs, client_options), vm);

=== modified file 'client/drizzledump.cc'
--- client/drizzledump.cc	2010-06-24 10:30:53 +0000
+++ client/drizzledump.cc	2010-07-30 19:39:47 +0000
@@ -2590,6 +2590,8 @@
   std::string system_config_dir_client(SYSCONFDIR); 
   system_config_dir_client.append("/drizzle/client.cnf");
 
+  std::string user_config_dir((getenv("XDG_CONFIG_HOME")? getenv("XDG_CONFIG_HOME"):"~/.config"));
+
   po::positional_options_description p;
   p.add("database-used", 1);
   p.add("Table-used",-1);
@@ -2605,15 +2607,21 @@
 
   if (! vm.count("no-defaults"))
   {
-    ifstream user_dump_ifs("~/.drizzle/drizzledump.cnf");
+    std::string user_config_dir_dump(user_config_dir);
+    user_config_dir_dump.append("/drizzle/drizzledump.cnf"); 
+
+    std::string user_config_dir_client(user_config_dir);
+    user_config_dir_client.append("/drizzle/client.cnf");
+
+    ifstream user_dump_ifs(user_config_dir_dump.c_str());
     po::store(parse_config_file(user_dump_ifs, dump_options), vm);
- 
+
+    ifstream user_client_ifs(user_config_dir_client.c_str());
+    po::store(parse_config_file(user_client_ifs, client_options), vm);
+
     ifstream system_dump_ifs(system_config_dir_dump.c_str());
-    store(parse_config_file(system_dump_ifs, dump_options), vm);
+    po::store(parse_config_file(system_dump_ifs, dump_options), vm);
 
-    ifstream user_client_ifs("~/.drizzle/client.cnf");
-    po::store(parse_config_file(user_client_ifs, client_options), vm);
- 
     ifstream system_client_ifs(system_config_dir_client.c_str());
     po::store(parse_config_file(system_client_ifs, client_options), vm);
   }

=== modified file 'client/drizzleimport.cc'
--- client/drizzleimport.cc	2010-06-21 11:59:50 +0000
+++ client/drizzleimport.cc	2010-07-30 19:39:47 +0000
@@ -468,18 +468,27 @@
   std::string system_config_dir_client(SYSCONFDIR); 
   system_config_dir_client.append("/drizzle/client.cnf");
   
+  std::string user_config_dir((getenv("XDG_CONFIG_HOME")? getenv("XDG_CONFIG_HOME"):"~/.config"));
+
   po::variables_map vm;
+
   po::store(po::command_line_parser(argc, argv).options(long_options).
             extra_parser(parse_password_arg).run(), vm);
 
-  ifstream user_import_ifs("~/.drizzle/drizzleimport.cnf");
+  std::string user_config_dir_import(user_config_dir);
+  user_config_dir_import.append("/drizzle/drizzleimport.cnf"); 
+
+  std::string user_config_dir_client(user_config_dir);
+  user_config_dir_client.append("/drizzle/client.cnf");
+
+  ifstream user_import_ifs(user_config_dir_import.c_str());
   po::store(parse_config_file(user_import_ifs, import_options), vm);
- 
+
+  ifstream user_client_ifs(user_config_dir_client.c_str());
+  po::store(parse_config_file(user_client_ifs, client_options), vm);
+
   ifstream system_import_ifs(system_config_dir_import.c_str());
   store(parse_config_file(system_import_ifs, import_options), vm);
-
-  ifstream user_client_ifs("~/.drizzle/client.cnf");
-  po::store(parse_config_file(user_client_ifs, client_options), vm);
  
   ifstream system_client_ifs(system_config_dir_client.c_str());
   po::store(parse_config_file(system_client_ifs, client_options), vm);

=== modified file 'client/drizzleslap.cc'
--- client/drizzleslap.cc	2010-06-21 11:59:50 +0000
+++ client/drizzleslap.cc	2010-07-30 19:39:47 +0000
@@ -848,9 +848,9 @@
 
  * long_options is the union of commandline_options, slap_options and client_options.
 
- * There are two configuration files per set of options, one which is defined by the user and
- * which is found at ~/.drizzle directory and the other which is the system configuration
- * file which is found in the SYSCONFDIR/drizzle directory.
+ * There are two configuration files per set of options, one which is defined by the user
+ * which is found at either $XDG_CONFIG_HOME/drizzle or ~/.config/drizzle directory and the other which 
+ * is the system configuration file which is found in the SYSCONFDIR/drizzle directory.
 
  * The system configuration file is over ridden by the user's configuration file which
  * in turn is over ridden by the command line.
@@ -979,6 +979,8 @@
     std::string system_config_dir_client(SYSCONFDIR); 
     system_config_dir_client.append("/drizzle/client.cnf");
 
+    std::string user_config_dir((getenv("XDG_CONFIG_HOME")? getenv("XDG_CONFIG_HOME"):"~/.config"));
+
     uint64_t temp_drizzle_port= 0;
     drizzle_con_st con;
     OptionString *eptr;
@@ -989,15 +991,21 @@
     po::store(po::command_line_parser(argc, argv).options(long_options).
             extra_parser(parse_password_arg).run(), vm);
 
-    ifstream user_slap_ifs("~/.drizzle/drizzleslap.cnf");
+    std::string user_config_dir_slap(user_config_dir);
+    user_config_dir_slap.append("/drizzle/drizzleslap.cnf"); 
+
+    std::string user_config_dir_client(user_config_dir);
+    user_config_dir_client.append("/drizzle/client.cnf");
+
+    ifstream user_slap_ifs(user_config_dir_slap.c_str());
     po::store(parse_config_file(user_slap_ifs, slap_options), vm);
 
+    ifstream user_client_ifs(user_config_dir_client.c_str());
+    po::store(parse_config_file(user_client_ifs, client_options), vm);
+
     ifstream system_slap_ifs(system_config_dir_slap.c_str());
     store(parse_config_file(system_slap_ifs, slap_options), vm);
 
-    ifstream user_client_ifs("~/.drizzle/client.cnf");
-    po::store(parse_config_file(user_client_ifs, client_options), vm);
-
     ifstream system_client_ifs(system_config_dir_client.c_str());
     store(parse_config_file(system_client_ifs, client_options), vm);
 
@@ -1006,7 +1014,7 @@
     if (process_options())
       exit(1);
 
-    if( vm.count("help") || vm.count("info"))
+    if ( vm.count("help") || vm.count("info"))
     {
       printf("%s  Ver %s Distrib %s, for %s-%s (%s)\n",internal::my_progname, SLAP_VERSION,
           drizzle_version(),HOST_VENDOR,HOST_OS,HOST_CPU);
@@ -1015,11 +1023,11 @@
           \nand you are welcome to modify and redistribute it under the GPL \
           license\n");
       puts("Run a query multiple times against the server\n");
-      cout<<long_options<<endl;
+      cout << long_options << endl;
       exit(0);
     }   
 
-    if(vm.count("port")) 
+    if (vm.count("port")) 
     {
       temp_drizzle_port= vm["port"].as<uint32_t>();
 
@@ -1034,7 +1042,7 @@
       }
     }
 
-  if( vm.count("password") )
+  if ( vm.count("password") )
   {
     if (!opt_password.empty())
       opt_password.erase();
@@ -1055,7 +1063,7 @@
 
 
 
-    if( vm.count("version") )
+    if ( vm.count("version") )
     {
       printf("%s  Ver %s Distrib %s, for %s-%s (%s)\n",internal::my_progname, SLAP_VERSION,
           drizzle_version(),HOST_VENDOR,HOST_OS,HOST_CPU);

=== modified file 'client/drizzletest.cc'
--- client/drizzletest.cc	2010-07-06 04:22:48 +0000
+++ client/drizzletest.cc	2010-07-30 19:39:47 +0000
@@ -5380,7 +5380,7 @@
 {
   if (in_opt_sleep < -1)
   {
-    cout<<N_("Error: Invalid Value for opt_sleep"); 
+    cout << N_("Error: Invalid Value for opt_sleep"); 
     exit(-1);
   }
   opt_sleep= in_opt_sleep;
@@ -5476,6 +5476,8 @@
   std::string system_config_dir_client(SYSCONFDIR); 
   system_config_dir_client.append("/drizzle/client.cnf");
 
+  std::string user_config_dir((getenv("XDG_CONFIG_HOME")? getenv("XDG_CONFIG_HOME"):"~/.config"));
+
   po::variables_map vm;
 
   po::store(po::command_line_parser(argc, argv).options(long_options).
@@ -5483,15 +5485,21 @@
 
   if (! vm["no-defaults"].as<bool>())
   {
-    ifstream user_test_ifs("~/.drizzle/drizzletest.cnf");
+    std::string user_config_dir_test(user_config_dir);
+    user_config_dir_test.append("/drizzle/drizzletest.cnf"); 
+
+    std::string user_config_dir_client(user_config_dir);
+    user_config_dir_client.append("/drizzle/client.cnf");
+
+    ifstream user_test_ifs(user_config_dir_test.c_str());
     po::store(parse_config_file(user_test_ifs, test_options), vm);
- 
+
+    ifstream user_client_ifs(user_config_dir_client.c_str());
+    po::store(parse_config_file(user_client_ifs, client_options), vm);
+
     ifstream system_test_ifs(system_config_dir_test.c_str());
     store(parse_config_file(system_test_ifs, test_options), vm);
 
-    ifstream user_client_ifs("~/.drizzle/client.cnf");
-    po::store(parse_config_file(user_client_ifs, client_options), vm);
- 
     ifstream system_client_ifs(system_config_dir_client.c_str());
     po::store(parse_config_file(system_client_ifs, client_options), vm);
   }