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
pull/1/head
Tatsuhiro Tsujikawa 2008-11-16 08:13:51 +00:00
parent 3c15414420
commit 03f91ba35a
6 changed files with 17 additions and 10 deletions

View File

@ -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> 2008-11-16 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added -V for the short form of --check-integrity option. Added -V for the short form of --check-integrity option.

View File

@ -505,7 +505,7 @@ Set TCP port number for BitTorrent downloads\&. Multiple ports can be specified
Note Note
Make sure that the specified ports are open for incoming TCP traffic\&. Make sure that the specified ports are open for incoming TCP traffic\&.
.PP .PP
\fB\-\-max\-upload\-limit\fR=SPEED \fB\-u\fR, \fB\-\-max\-upload\-limit\fR=SPEED
.RS 4 .RS 4
Set max upload speed in bytes per sec\&. Set max upload speed in bytes per sec\&.
\fI0\fR \fI0\fR

View File

@ -1063,7 +1063,7 @@ writes the piece to the appropriate files.</td>
</div> </div>
<div class="vlist"><dl> <div class="vlist"><dl>
<dt> <dt>
<strong>--max-upload-limit</strong>=SPEED <strong>-u</strong>, <strong>--max-upload-limit</strong>=SPEED
</dt> </dt>
<dd> <dd>
<p> <p>
@ -2021,7 +2021,7 @@ files in the program, then also delete it here.</p></div>
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2008-11-16 13:49:20 JST Last updated 2008-11-16 17:09:18 JST
</div> </div>
</div> </div>
</body> </body>

View File

@ -365,7 +365,7 @@ BitTorrent Specific Options
[NOTE] [NOTE]
Make sure that the specified ports are open for incoming TCP traffic. 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. Set max upload speed in bytes per sec. '0' means unrestricted.
You can append 'K' or 'M'(1K = 1024, 1M = 1024K). You can append 'K' or 'M'(1K = 1024, 1M = 1024K).
Default: '0' Default: '0'

View File

@ -200,7 +200,7 @@ Option* option_processing(int argc, char* const argv[])
//{ "upload-limit".c_str(), required_argument, &lopt, 20 }, //{ "upload-limit".c_str(), required_argument, &lopt, 20 },
{ PREF_SEED_TIME.c_str(), required_argument, &lopt, 22 }, { PREF_SEED_TIME.c_str(), required_argument, &lopt, 22 },
{ PREF_SEED_RATIO.c_str(), required_argument, &lopt, 23 }, { 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_PEER_ID_PREFIX.c_str(), required_argument, &lopt, 25 },
{ PREF_ENABLE_PEER_EXCHANGE.c_str(), optional_argument, &lopt, 26 }, { PREF_ENABLE_PEER_EXCHANGE.c_str(), optional_argument, &lopt, 26 },
{ PREF_ENABLE_DHT.c_str(), optional_argument, &lopt, 27 }, { 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 } { 0, 0, 0, 0 }
}; };
c = getopt_long(argc, argv, 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); longOpts, &optIndex);
if(c == -1) { if(c == -1) {
break; break;
@ -302,9 +302,6 @@ Option* option_processing(int argc, char* const argv[])
case 23: case 23:
cmdstream << PREF_SEED_RATIO << "=" << optarg << "\n"; cmdstream << PREF_SEED_RATIO << "=" << optarg << "\n";
break; break;
case 24:
cmdstream << PREF_MAX_UPLOAD_LIMIT << "=" << optarg << "\n";
break;
case 25: case 25:
cmdstream << PREF_PEER_ID_PREFIX << "=" << optarg << "\n"; cmdstream << PREF_PEER_ID_PREFIX << "=" << optarg << "\n";
break; break;
@ -541,6 +538,9 @@ Option* option_processing(int argc, char* const argv[])
case 'V': case 'V':
cmdstream << PREF_CHECK_INTEGRITY << "=" << toBoolArg(optarg) << "\n"; cmdstream << PREF_CHECK_INTEGRITY << "=" << toBoolArg(optarg) << "\n";
break; break;
case 'u':
cmdstream << PREF_MAX_UPLOAD_LIMIT << "=" << optarg << "\n";
break;
case 'v': case 'v':
showVersion(); showVersion();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);

View File

@ -227,7 +227,7 @@ _(" --listen-port=PORT... Set TCP port number for BitTorrent downloads.\n
" to specify a range: \"6881-6999\". ',' and '-' can\n"\ " to specify a range: \"6881-6999\". ',' and '-' can\n"\
" be used together.") " be used together.")
#define TEXT_MAX_UPLOAD_LIMIT \ #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"\ " 0 means unrestricted.\n"\
" You can append K or M(1K = 1024, 1M = 1024K).") " You can append K or M(1K = 1024, 1M = 1024K).")
#define TEXT_SEED_TIME \ #define TEXT_SEED_TIME \