From 03f91ba35ae2a44542114377d9411bf9d828e0d1 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 16 Nov 2008 08:13:51 +0000
Subject: [PATCH] 2008-11-16  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Added -u for the short form of --max-upload-limit option.
	* doc/aria2c.1.txt
	* src/option_processing.cc
	* src/usage_text.h
---
 ChangeLog                |  7 +++++++
 doc/aria2c.1             |  2 +-
 doc/aria2c.1.html        |  4 ++--
 doc/aria2c.1.txt         |  2 +-
 src/option_processing.cc | 10 +++++-----
 src/usage_text.h         |  2 +-
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 979649dd..a3ac6c76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-16  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added -u for the short form of --max-upload-limit option.
+	* doc/aria2c.1.txt
+	* src/option_processing.cc
+	* src/usage_text.h
+
 2008-11-16  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added -V for the short form of --check-integrity option.
diff --git a/doc/aria2c.1 b/doc/aria2c.1
index 19012251..183126ce 100644
--- a/doc/aria2c.1
+++ b/doc/aria2c.1
@@ -505,7 +505,7 @@ Set TCP port number for BitTorrent downloads\&. Multiple ports can be specified
 Note
 Make sure that the specified ports are open for incoming TCP traffic\&.
 .PP
-\fB\-\-max\-upload\-limit\fR=SPEED
+\fB\-u\fR, \fB\-\-max\-upload\-limit\fR=SPEED
 .RS 4
 Set max upload speed in bytes per sec\&.
 \fI0\fR
diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html
index 48f4736d..95ab6e24 100644
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@@ -1063,7 +1063,7 @@ writes the piece to the appropriate files.</td>
 </div>
 <div class="vlist"><dl>
 <dt>
-<strong>--max-upload-limit</strong>=SPEED
+<strong>-u</strong>, <strong>--max-upload-limit</strong>=SPEED
 </dt>
 <dd>
 <p>
@@ -2021,7 +2021,7 @@ files in the program, then also delete it here.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-11-16 13:49:20 JST
+Last updated 2008-11-16 17:09:18 JST
 </div>
 </div>
 </body>
diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt
index e31889c8..d097b575 100644
--- a/doc/aria2c.1.txt
+++ b/doc/aria2c.1.txt
@@ -365,7 +365,7 @@ BitTorrent Specific Options
 [NOTE]
 Make sure that the specified ports are open for incoming TCP traffic.
 
-*--max-upload-limit*=SPEED::
+*-u*, *--max-upload-limit*=SPEED::
   Set max upload speed in bytes per sec. '0' means unrestricted.
   You can append 'K' or 'M'(1K = 1024, 1M = 1024K).
   Default: '0'
diff --git a/src/option_processing.cc b/src/option_processing.cc
index ce304ad3..1f95a856 100644
--- a/src/option_processing.cc
+++ b/src/option_processing.cc
@@ -200,7 +200,7 @@ Option* option_processing(int argc, char* const argv[])
       //{ "upload-limit".c_str(), required_argument, &lopt, 20 },
       { PREF_SEED_TIME.c_str(), required_argument, &lopt, 22 },
       { PREF_SEED_RATIO.c_str(), required_argument, &lopt, 23 },
-      { PREF_MAX_UPLOAD_LIMIT.c_str(), required_argument, &lopt, 24 },
+      { PREF_MAX_UPLOAD_LIMIT.c_str(), required_argument, 0, 'u' },
       { PREF_PEER_ID_PREFIX.c_str(), required_argument, &lopt, 25 },
       { PREF_ENABLE_PEER_EXCHANGE.c_str(), optional_argument, &lopt, 26 },
       { PREF_ENABLE_DHT.c_str(), optional_argument, &lopt, 27 },
@@ -229,7 +229,7 @@ Option* option_processing(int argc, char* const argv[])
       { 0, 0, 0, 0 }
     };
     c = getopt_long(argc, argv, 
-		    "Dd:o:l:s:pt:m:vh::ST:M:C:a:cU:ni:j:Z::P::q::R::V::",
+		    "Dd:o:l:s:pt:m:vh::ST:M:C:a:cU:ni:j:Z::P::q::R::V::u:",
 		    longOpts, &optIndex);
     if(c == -1) {
       break;
@@ -302,9 +302,6 @@ Option* option_processing(int argc, char* const argv[])
       case 23:
 	cmdstream << PREF_SEED_RATIO << "=" << optarg << "\n";
 	break;
-      case 24:
-	cmdstream << PREF_MAX_UPLOAD_LIMIT << "=" << optarg << "\n";
-	break;
       case 25:
 	cmdstream << PREF_PEER_ID_PREFIX << "=" << optarg << "\n";
 	break;
@@ -541,6 +538,9 @@ Option* option_processing(int argc, char* const argv[])
     case 'V':
       cmdstream << PREF_CHECK_INTEGRITY << "=" << toBoolArg(optarg) << "\n";
       break;
+    case 'u':
+      cmdstream << PREF_MAX_UPLOAD_LIMIT << "=" << optarg << "\n";
+      break;
     case 'v':
       showVersion();
       exit(EXIT_SUCCESS);
diff --git a/src/usage_text.h b/src/usage_text.h
index be9e7d57..4061c57e 100644
--- a/src/usage_text.h
+++ b/src/usage_text.h
@@ -227,7 +227,7 @@ _(" --listen-port=PORT...        Set TCP port number for BitTorrent downloads.\n
   "                              to specify a range: \"6881-6999\". ',' and '-' can\n"\
   "                              be used together.")
 #define TEXT_MAX_UPLOAD_LIMIT \
-_(" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"\
+_(" -u, --max-upload-limit=SPEED Set max upload speed in bytes per sec.\n"\
   "                              0 means unrestricted.\n"\
   "                              You can append K or M(1K = 1024, 1M = 1024K).")
 #define TEXT_SEED_TIME \