Преглед на файлове

2009-01-27 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Remove leading "--" from help keyword and a substring after "="
	from help keyword, so that one can query options by '-h--max-'
	or '-hmax-peers=10'.	
	* src/option_processing.cc
Tatsuhiro Tsujikawa преди 16 години
родител
ревизия
120ea4c609
променени са 2 файла, в които са добавени 18 реда и са изтрити 4 реда
  1. 7 0
      ChangeLog
  2. 11 4
      src/option_processing.cc

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+2009-01-27  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Remove leading "--" from help keyword and a substring after "="
+	from help keyword, so that one can query options by '-h--max-' or
+	'-hmax-peers=10'.	
+	* src/option_processing.cc
+
 2009-01-25  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Rewritten PStringVisitor and its implementation.

+ 11 - 4
src/option_processing.cc

@@ -578,13 +578,20 @@ Option* option_processing(int argc, char* const argv[])
       exit(DownloadResult::FINISHED);
     case 'h':
       {
-	std::string category;
+	std::string keyword;
 	if(optarg == 0 || strlen(optarg) == 0) {
-	  category = TAG_BASIC;
+	  keyword = TAG_BASIC;
 	} else {
-	  category = optarg;
+	  keyword = optarg;
+	  if(Util::startsWith(keyword, "--")) {
+	    keyword = keyword.substr(2);
+	  }
+	  std::string::size_type eqpos = keyword.find("=");
+	  if(eqpos != std::string::npos) {
+	    keyword = keyword.substr(0, eqpos);
+	  }
 	}
-	showUsage(category, oparser);
+	showUsage(keyword, oparser);
 	exit(DownloadResult::FINISHED);
       }
     default: