2008-01-11 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Added --no-conf and --conf-path command-line option.
	--no-conf option disables loading aria2.conf file.
	--conf-path option changes the configuration file path. The 
default
	file path is $HOME/.aria2/aria2.conf
	Added a warning message when the configuration file is not 
found.
	* src/HelpItemFactory.cc
	* src/option_processing.cc
	* src/prefs.h
	* src/usage_text.h

1 files changed, 11 insertions, 1 deletions

diff --git a/src/HelpItemFactory.cc b/src/HelpItemFactory.cc
index 78027166..72540044 100644
--- a/src/HelpItemFactory.cc
+++ b/src/HelpItemFactory.cc
@@ -389,12 +389,22 @@ TagContainerHandle HelpItemFactory::createHelpItems()
     tc->addItem(item);
   }
   {
+    HelpItemHandle item = new HelpItem("no-conf", TEXT_NO_CONF);
+    item->addTag(TAG_ADVANCED);
+    tc->addItem(item);
+  }
+  {
+    HelpItemHandle item = new HelpItem("conf-path", TEXT_CONF_PATH, "$HOME/.aria2/aria2.conf");
+    item->addTag(TAG_ADVANCED);
+    tc->addItem(item);
+  }
+  {
     HelpItemHandle item = new HelpItem("help", TEXT_HELP, TAG_BASIC);
     char buf[64];
     snprintf(buf, sizeof(buf), "%s,%s,%s,%s,%s,%s,all", TAG_BASIC, TAG_ADVANCED, TAG_HTTP, TAG_FTP, TAG_METALINK, TAG_BITTORRENT);
     item->setAvailableValues(buf);
     item->addTag(TAG_BASIC);
     tc->addItem(item);
-  }    
+  }
   return tc;
 }