1 files changed, 45 insertions, 17 deletions

diff --git a/src/global.cc b/src/global.cc
index a718d6cb..a4da6ead 100644
--- a/src/global.cc
+++ b/src/global.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2012, John Wiegley.  All rights reserved.
+ * Copyright (c) 2003-2013, John Wiegley.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -44,6 +44,7 @@
 namespace ledger {
 
 static bool args_only = false;
+std::string       _init_file;
 
 global_scope_t::global_scope_t(char ** envp)
 {
@@ -106,30 +107,53 @@ global_scope_t::~global_scope_t()
 #endif
 }
 
+void global_scope_t::parse_init(path init_file)
+{
+  TRACE_START(init, 1, "Read initialization file");
+  
+  parse_context_stack_t parsing_context;
+  parsing_context.push(init_file);
+  parsing_context.get_current().journal = session().journal.get();
+  parsing_context.get_current().scope   = &report();
+
+  if (session().journal->read(parsing_context) > 0 ||
+      session().journal->auto_xacts.size() > 0 ||
+      session().journal->period_xacts.size() > 0) {
+    throw_(parse_error, _f("Transactions found in initialization file '%1%'")
+	   % init_file);
+  }
+  
+  TRACE_FINISH(init, 1);
+}
+
 void global_scope_t::read_init()
 {
+  // if specified on the command line init_file_ is filled in 
+  // global_scope_t::handle_debug_options.  If it was specified on the command line
+  // fail is the file doesn't exist. If no init file was specified
+  // on the command-line then try the default values, but don't fail if there
+  // isn't one.
+  path init_file;
   if (HANDLED(init_file_)) {
-    path init_file(HANDLER(init_file_).str());
+    init_file=HANDLER(init_file_).str();
     if (exists(init_file)) {
-      TRACE_START(init, 1, "Read initialization file");
-
-      parse_context_stack_t parsing_context;
-      parsing_context.push(init_file);
-      parsing_context.get_current().journal = session().journal.get();
-      parsing_context.get_current().scope   = &report();
-
-      if (session().journal->read(parsing_context) > 0 ||
-          session().journal->auto_xacts.size() > 0 ||
-          session().journal->period_xacts.size() > 0) {
-        throw_(parse_error, _f("Transactions found in initialization file '%1%'")
-               % init_file);
-      }
-
-      TRACE_FINISH(init, 1);
+      parse_init(init_file);
+    } else {
+      throw_(parse_error, _f("Could not find specified init file %1%") % init_file);
     }
+  } else {
+    if (const char * home_var = std::getenv("HOME")){
+      init_file = (path(home_var) / ".ledgerrc");
+    } else {
+      init_file = ("./.ledgerrc");
+    }
+  }
+  if(exists(init_file)){
+    parse_init(init_file);
   }
 }
 
+
 char * global_scope_t::prompt_string()
 {
   static char prompt[32];
@@ -473,6 +497,10 @@ void handle_debug_options(int argc, char * argv[])
         _log_level = LOG_INFO;
 #endif
       }
+      else if (i + 1 < argc && std::strcmp(argv[i], "--init-file") == 0) {
+        _init_file = argv[i + 1];
+        i++;
+      }
       else if (i + 1 < argc && std::strcmp(argv[i], "--debug") == 0) {
 #if DEBUG_ON
         _log_level    = LOG_DEBUG;