summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2008-12-02 15:53:27 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2008-12-02 15:53:27 +0000
commitfa882f32408b3eed4020bb12d3505df00038da41 (patch)
tree926553b7649f99aa8d10a2ccec46e3fe284302a9
parent94f912ffeffc10b91f1d46587897025f1e3d8293 (diff)
2008-12-03 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added `https' tag to help option category. Added https tag to --ca-certificate, --certificate, --check-certificate and --private-key option. * src/OptionHandlerFactory.cc * src/help_tags.h * src/option_processing.cc
-rw-r--r--ChangeLog9
-rw-r--r--src/OptionHandlerFactory.cc7
-rw-r--r--src/help_tags.h1
-rw-r--r--src/option_processing.cc12
4 files changed, 23 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d4de9c1..fd8ad26b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-03 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
+
+ Added `https' tag to help option category. Added https tag to
+ --ca-certificate, --certificate, --check-certificate and
+ --private-key option.
+ * src/OptionHandlerFactory.cc
+ * src/help_tags.h
+ * src/option_processing.cc
+
2008-12-02 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Changed the package name from `aria2c' to `aria2' in order to fix
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index db53baa5..0c87e570 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -434,6 +434,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
(PREF_CA_CERTIFICATE,
TEXT_CA_CERTIFICATE));
op->addTag(TAG_HTTP);
+ op->addTag(TAG_HTTPS);
handlers.push_back(op);
}
{
@@ -441,6 +442,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
(PREF_CERTIFICATE,
TEXT_CERTIFICATE));
op->addTag(TAG_HTTP);
+ op->addTag(TAG_HTTPS);
handlers.push_back(op);
}
{
@@ -449,6 +451,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
TEXT_CHECK_CERTIFICATE,
V_FALSE));
op->addTag(TAG_HTTP);
+ op->addTag(TAG_HTTPS);
handlers.push_back(op);
}
{
@@ -525,6 +528,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
(PREF_PRIVATE_KEY,
TEXT_PRIVATE_KEY));
op->addTag(TAG_HTTP);
+ op->addTag(TAG_HTTPS);
handlers.push_back(op);
}
{
@@ -952,10 +956,11 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
("help",
TEXT_HELP,
TAG_BASIC,
- StringFormat("%s,%s,%s,%s,%s,%s,%s,all",
+ StringFormat("%s,%s,%s,%s,%s,%s,%s,%s,all",
TAG_BASIC,
TAG_ADVANCED,
TAG_HTTP,
+ TAG_HTTPS,
TAG_FTP,
TAG_METALINK,
TAG_BITTORRENT,
diff --git a/src/help_tags.h b/src/help_tags.h
index f52b5de4..88993f86 100644
--- a/src/help_tags.h
+++ b/src/help_tags.h
@@ -38,6 +38,7 @@
#define TAG_BASIC "basic"
#define TAG_ADVANCED "advanced"
#define TAG_HTTP "http"
+#define TAG_HTTPS "https"
#define TAG_FTP "ftp"
#define TAG_METALINK "metalink"
#define TAG_BITTORRENT "bittorrent"
diff --git a/src/option_processing.cc b/src/option_processing.cc
index 19f45042..169806a8 100644
--- a/src/option_processing.cc
+++ b/src/option_processing.cc
@@ -33,6 +33,13 @@
*/
/* copyright --> */
#include "common.h"
+
+#include <cstdlib>
+#include <cstring>
+#include <fstream>
+#include <sstream>
+#include <iostream>
+
#include "Option.h"
#include "prefs.h"
#include "OptionParser.h"
@@ -46,11 +53,6 @@
#include "File.h"
#include "StringFormat.h"
#include "OptionHandlerException.h"
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <sstream>
-#include <iostream>
extern char* optarg;
extern int optind, opterr, optopt;