From 15b207a53eaede393699c089ac0707796add8095 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 29 Apr 2006 11:23:39 +0000
Subject: [PATCH] 	* src/SocketCore.cc 	(writeData): Removed timeout
 argument. 	(readData): Removed timeout argument. 	(peekData): Removed
 timeout argument. 	* src/Socket.cc 	(writeData): Removed timeout
 argument. 	(readData): Removed timeout argument. 	(peekData): Removed
 timeout argument.

---
 ChangeLog                    |  15 ++++++++++++++-
 configure                    |  20 ++++++++++----------
 configure.ac                 |   2 +-
 po/Makefile.in               |   2 +-
 po/ja.gmo                    | Bin 21398 -> 22315 bytes
 po/ja.po                     |   9 ++++++---
 src/SendMessageQueue.cc      |   3 ---
 src/Socket.cc                |  16 ++++++++--------
 src/Socket.h                 |   8 ++++----
 src/SocketCore.cc            |   6 +++---
 src/SocketCore.h             |  12 +++---------
 src/TorrentDownloadEngine.cc |   4 ++--
 src/main.cc                  |   6 +++---
 13 files changed, 55 insertions(+), 48 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c0a00b3..08f85fa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,20 @@
 	(unfoldSubRange): New function
 	* src/main.cc
 	(showUsage): Added help message.
-	(main): Added --select-file command-line option.
+	(main): Added --select-file command-line option. Updated the layout of
+	file listing.
+	* src/common.h
+	(Integers): New definition.
+
+	* src/SocketCore.cc
+	(writeData): Removed timeout argument.
+	(readData): Removed timeout argument.
+	(peekData): Removed timeout argument.
+	* src/Socket.cc
+	(writeData): Removed timeout argument.
+	(readData): Removed timeout argument.
+	(peekData): Removed timeout argument.
+	
 	
 2006-04-28  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
diff --git a/configure b/configure
index da453670..e6ad1769 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for aria2c 0.4.0.
+# Generated by GNU Autoconf 2.59 for aria2c 0.4.1.
 #
 # Report bugs to <tujikawa@rednoah.com>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='aria2c'
 PACKAGE_TARNAME='aria2c'
-PACKAGE_VERSION='0.4.0'
-PACKAGE_STRING='aria2c 0.4.0'
+PACKAGE_VERSION='0.4.1'
+PACKAGE_STRING='aria2c 0.4.1'
 PACKAGE_BUGREPORT='tujikawa@rednoah.com'
 
 ac_unique_file="src/Socket.h"
@@ -788,7 +788,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures aria2c 0.4.0 to adapt to many kinds of systems.
+\`configure' configures aria2c 0.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -854,7 +854,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of aria2c 0.4.0:";;
+     short | recursive ) echo "Configuration of aria2c 0.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -994,7 +994,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-aria2c configure 0.4.0
+aria2c configure 0.4.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1008,7 +1008,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by aria2c $as_me 0.4.0, which was
+It was created by aria2c $as_me 0.4.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1651,7 +1651,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='aria2c'
- VERSION='0.4.0'
+ VERSION='0.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11529,7 +11529,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by aria2c $as_me 0.4.0, which was
+This file was extended by aria2c $as_me 0.4.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11592,7 +11592,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-aria2c config.status 0.4.0
+aria2c config.status 0.4.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 47ad6137..b9f39335 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 AC_PREREQ(2.59)
-AC_INIT(aria2c, 0.4.0, tujikawa@rednoah.com)
+AC_INIT(aria2c, 0.4.1, tujikawa@rednoah.com)
 AM_INIT_AUTOMAKE()
 AM_PATH_CPPUNIT(1.10.2)
 AC_CONFIG_SRCDIR([src/Socket.h])
diff --git a/po/Makefile.in b/po/Makefile.in
index 3c256007..73884307 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -9,7 +9,7 @@
 # General Public License and is *not* in the public domain.
 
 PACKAGE = aria2c
-VERSION = 0.4.0
+VERSION = 0.4.1
 
 SHELL = /bin/sh
 
diff --git a/po/ja.gmo b/po/ja.gmo
index 253907d353c01e29a1c4d7dfe8450295626dc710..5ea5ef32c32af1e6977d1e090c62871d26d4567d 100644
GIT binary patch
delta 3620
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
LrFFE-&&~NSW@<Ra

delta 2978
zcmZYBeN0zX9LMqR&p`PJickDNlmPKr5J9s<&>zZA6g82aOdhlnA5z3;4Ii%g02<A$
zQgh8*n<#5;mSe`UnwgcAY5k+MNzR<M*79lo;ilAjf9}0Cx9<G%I_KQqz2}_oIp@wJ
zM+1AC1J30hQG1MQ2ho?Ph%!5l`(yaSwJg>w9hYMvzJ<N<0%qYYJccQ8W*q}&Kj3=m
z7rU4>VOdwRHFytIUm9=LiaooTm6$npmV!DAbvG-;?{O-o^e|h3i*OQN#2ISuX?6!|
zun6b$GW#5x@BmgPm}O#A$a_x?YTz3&f+sN#qZ7^Q>EFT>meOzr!#FyLz_r+!868En
zf6TPyeN4x($!5h^iT&^p4##hhvDiI)6yy4s4ZvaeCeFnEcn!<x--6^lh}Fp8tQMJs
z)#G^Fk15!OJY)AU6+<+tJ{lRLm7&@fqXyK7<M1ddb2l&t3mBCKP>aq$3cD$gUHb&d
zzMaQWcm?&t1m3Cv=AqWS2-U#~)Y9z1G1%rCN@KRvOK~J_@arGqAnI*66r<9~zh0D0
zK9!;}R0r#jzU?sThhJeX-bVge1`lbCBdF(Apnks(2V*O009Q~0h|6GeVi+~iVpPUv
zXE^Lc3M*+~V_E|$18*Z)w)atM`8Bdn?UH~0Pt*bV8}*`2q)E@EA<J&LzSDgdqGrAo
zwG>Bi1U_&m@D9sl8d}Rz9D++wGuewx9oV&~4(HLR4r@>|u18*BhfquT9V&x&P!mYy
zWt>FI$H%Y)qj58808TvxrLq;Z=GRau>rLL3!s)1)y@Kkv5!GRnU;h?0kgKSr3Gk4<
z4;h$^1-L!HfKkugrLzboF-qp-SQUjF8n)qK{0O`AKqY7C3+lDJWgq4;+>>|~f5t{0
z(syGX8{>6MX4L1g8BgOHW^)Sjn6~b><7>E+vpofSJ#O}k&VLmJu>2>?KEqG(SFB@8
zbIU67m_6>sFm@eFR&WOD{J)EJcpbOl+<dQt>lmh<U0^n!2`$4_)PEZ1eUPS&XTPZ9
zT@<tgAE*J_P;2uSCgSk0*FFjLVOoH@@Bor^%PKV6g0nCVFJT(~j@sP831-h?3Z~;K
z)Slam4$EREDD=bMFbRVbz0K4QSq+<l`rTTbg$Gf4r5*Lf%PBJBQJahE@F2!wD{5k=
zQ3Jh=k6<4*fZ9_dB%Y0G(`cB9tFZ*n;AHH<*F_JOqaLXDZSmW$pfVN9I_Q2rs=f$W
zEqezC;sw<Aqa9fl%jV_%ami%IyYU7Mdcl|ejXS6ZLhKa1a0=>$br{6ss9k>&mAT8P
zr3x^5WuP}Ib6Ge9%TcM{jyfI9n1-hu3QE;g|He&BrXDlZKSnr+dI9PM)tHJ6NRq7C
zzkdS<P*0fVt?gJ;$8%86@5E?we+(0-xAGOz`<!zW^x!QViV3B3hGBdXH(?r{Lw!1L
zBKy(;tXDJ^qB2vAIxSmJ_fH@j-R>hN(#Di|9oJxA>RXYM?bv%1l)@iTYjqbjkmRSl
z_6RDK3o(G}2u`Rw3vhocI}vHb2x1<gcdjPF#7o2mVi}>%7ZJK<y9b{_cS2`V$3#0+
zmv(pz(LfXvTL@iBo32daIbtrco?xQx@k_xMiNS=9>q4R{kxTsVV*lAzV(CM7l!aJ=
z3A-uX_Ru{Qm5qshn|86T5Yda!n(rWj#M6YX=ZTGkmTLmhhtRd0aC98_(79{H2h9C1
zR|RSl>a6qCbiaPJm_gJK+leYd*8-xOTk^gI<&+EkdY$jXBvD}xS|!n0>p$PWI|*5O
z_uIS)*^llu$d}FHUdmV(q9ZZVZSgi>HRYZ}JTZ*mAi0;0+jL?Lv6;}Nqw8I~EtL|d
zhyM(EJN#wu&VPT|@a~C-!o|b@;u%7x<5glU5h4D)I#5_atR&|6jgxUap>M<sep?ad
f=%v<jDE2|HC6ahB)M3<^mOrv;y0pX>^iBQ;@AoxD

diff --git a/po/ja.po b/po/ja.po
index dbbdc4f1..305ca82b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -705,9 +705,12 @@ msgid ""
 "\".\n"
 "                              ',' and '-' can be used together.\n"
 msgstr ""
-" --select-file=INDEX...       インデックスでダウンロード対象ファイルを指定しま\n"
-"                              す. インデックスは --show-files オプションで知る\n"
-"                              ことができます. 複数のインデックスを ',' で区切っ\n"
+" --select-file=INDEX...       インデックスでダウンロード対象ファイルを指定し"
+"ま\n"
+"                              す. インデックスは --show-files オプションで知"
+"る\n"
+"                              ことができます. 複数のインデックスを ',' で区"
+"切っ\n"
 "                              て指定できます: \"3,6\"\n"
 "                              また, '-' を使って範囲指定もできます: \"1-5\"\n"
 "                              ',' と '-' は組み合わせて使うことができます.\n"
diff --git a/src/SendMessageQueue.cc b/src/SendMessageQueue.cc
index 4b88d3ea..fd052037 100644
--- a/src/SendMessageQueue.cc
+++ b/src/SendMessageQueue.cc
@@ -35,14 +35,12 @@ SendMessageQueue::~SendMessageQueue() {
 }
 
 void SendMessageQueue::send(int uploadSpeed) {
-  //logger->debug("SendMessageQueue:send start");
   int size = pendingMessages.size();
   for(int i = 0; i < size; i++) {
     PendingMessage msg = pendingMessages.front();
     pendingMessages.pop_front();
     if(uploadLimit != 0 && uploadSpeed >= uploadLimit*1024 &&
        msg.getPeerMessageId() == PeerMessage::PIECE && !msg.isInProgress()) {
-      //logger->debug("upload speed limiter enabled, uploadSpeed=%d", uploadSpeed);
       pendingMessages.push_back(msg);
     } else {
       if(!msg.processMessage()) {
@@ -51,7 +49,6 @@ void SendMessageQueue::send(int uploadSpeed) {
       }
     }
   }
-  //logger->debug("SendMessageQueue:send end");
 }
 
 void SendMessageQueue::addPendingMessage(const PendingMessage& pendingMessage) {
diff --git a/src/Socket.cc b/src/Socket.cc
index 881e6bbc..a7840642 100644
--- a/src/Socket.cc
+++ b/src/Socket.cc
@@ -89,20 +89,20 @@ bool Socket::isReadable(int timeout) const {
   return core->isReadable(timeout);
 }
 
-void Socket::writeData(const char* data, int len, int timeout) const {
-  core->writeData(data, len, timeout);
+void Socket::writeData(const char* data, int len) const {
+  core->writeData(data, len);
 }
 
-void Socket::writeData(const string& str, int timeout) const {
-  core->writeData(str.c_str(), str.size(), timeout);
+void Socket::writeData(const string& str) const {
+  core->writeData(str.c_str(), str.size());
 }
 
-void Socket::readData(char* data, int& len, int timeout) const {
-  core->readData(data, len, timeout);
+void Socket::readData(char* data, int& len) const {
+  core->readData(data, len);
 }
 
-void Socket::peekData(char* data, int& len, int timeout) const {
-  core->peekData(data, len, timeout);
+void Socket::peekData(char* data, int& len) const {
+  core->peekData(data, len);
 }
 
 void Socket::initiateSecureConnection() const {
diff --git a/src/Socket.h b/src/Socket.h
index d9686285..5667f207 100644
--- a/src/Socket.h
+++ b/src/Socket.h
@@ -96,22 +96,22 @@ public:
   /**
    * @see SocketCore::writeData()
    */
-  void writeData(const char* data, int len, int timeout = 5) const;
+  void writeData(const char* data, int len) const;
   /**
    * A covenient function that can take string class parameter and
    * internally calls SocketCore::writeData().
    */
-  void writeData(const string& str, int timeout = 5) const;
+  void writeData(const string& str) const;
 
   /**
    * @see SocketCore::readData()
    */
-  void readData(char* data, int& len, int timeout = 5) const;
+  void readData(char* data, int& len) const;
 
   /**
    * @see SocketCore::peekData()
    */
-  void peekData(char* data, int& len, int timeout = 5) const;
+  void peekData(char* data, int& len) const;
 
   /**
    * @see SocketCore::initiateSecureConnection()
diff --git a/src/SocketCore.cc b/src/SocketCore.cc
index 9002dc1b..2a8b54eb 100644
--- a/src/SocketCore.cc
+++ b/src/SocketCore.cc
@@ -262,7 +262,7 @@ bool SocketCore::isReadable(int timeout) const {
   }
 }
 
-void SocketCore::writeData(const char* data, int len, int timeout) {
+void SocketCore::writeData(const char* data, int len) {
   int ret = 0;
   if(!secure && (ret = send(sockfd, data, (size_t)len, 0)) != len
 #ifdef HAVE_LIBSSL
@@ -288,7 +288,7 @@ void SocketCore::writeData(const char* data, int len, int timeout) {
   }
 }
 
-void SocketCore::readData(char* data, int& len, int timeout) {
+void SocketCore::readData(char* data, int& len) {
   int ret = 0;
   if(!secure && (ret = recv(sockfd, data, (size_t)len, 0)) < 0
 #ifdef HAVE_LIBSSL
@@ -315,7 +315,7 @@ void SocketCore::readData(char* data, int& len, int timeout) {
   len = ret;
 }
 
-void SocketCore::peekData(char* data, int& len, int timeout) {
+void SocketCore::peekData(char* data, int& len) {
   int ret = 0;
   if(!secure && (ret = recv(sockfd, data, (size_t)len, MSG_PEEK)) < 0
 #ifdef HAVE_LIBSSL
diff --git a/src/SocketCore.h b/src/SocketCore.h
index 7c2a2634..e1b54464 100644
--- a/src/SocketCore.h
+++ b/src/SocketCore.h
@@ -139,10 +139,8 @@ public:
    * for this method call.
    * @param data data to write
    * @param len length of data
-   * @param timeout the amount of time elapsed before isWritable()
-   * are timed out.
    */
-  void writeData(const char* data, int len, int timeout = 0);
+  void writeData(const char* data, int len);
 
   /**
    * Reads up to len bytes from this socket.
@@ -155,10 +153,8 @@ public:
    * @param data holder to store data.
    * @param len the maximum size data can store. This method assigns
    * the number of bytes read to len.
-   * @param timeout the amount of time elapsed before isReadable() are timed
-   * out.
    */
-  void readData(char* data, int& len, int timeout = 0);
+  void readData(char* data, int& len);
 
   /**
    * Reads up to len bytes from this socket, but bytes are not removed from
@@ -168,10 +164,8 @@ public:
    * @param data holder to store data.
    * @param len the maximum size data can store. This method assigns
    * the number of bytes read to len.
-   * @param timeout the amount of time elapsed before isReadable() are timed
-   * out.
    */
-  void peekData(char* data, int& len, int timeout = 0);
+  void peekData(char* data, int& len);
   
   /**
    * Makes this socket secure.
diff --git a/src/TorrentDownloadEngine.cc b/src/TorrentDownloadEngine.cc
index cfd6e57c..48038b6d 100644
--- a/src/TorrentDownloadEngine.cc
+++ b/src/TorrentDownloadEngine.cc
@@ -96,10 +96,10 @@ void TorrentDownloadEngine::calculateStatistics() {
     totalLength = torrentMan->getTotalLength();
   }
   
+  downloadSpeed = calculateSpeed(sessionDownloadLengthArray[currentCp], elapsed);
+  uploadSpeed = calculateSpeed(sessionUploadLengthArray[currentCp], elapsed);
 
   if(elapsed-lastElapsed >= 1) {
-    downloadSpeed = calculateSpeed(sessionDownloadLengthArray[currentCp], elapsed);
-    uploadSpeed = calculateSpeed(sessionUploadLengthArray[currentCp], elapsed);
     avgSpeed = calculateSpeed(sessionDownloadLength,
 			      Util::difftvsec(now, startup));
     if(avgSpeed < 0) {
diff --git a/src/main.cc b/src/main.cc
index e08d8c84..0dec5554 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -670,13 +670,13 @@ int main(int argc, char* argv[]) {
 	  te->torrentMan->readFileEntryFromMetaInfoFile(targetTorrentFile);
 	cout << _("Files:") << endl;
 	cout << "idx|path/length" << endl;
-	cout << "===============================================================================" << endl;
+	cout << "===+===========================================================================" << endl;
 	int count = 1;
 	for(FileEntries::const_iterator itr = fileEntries.begin();
 	    itr != fileEntries.end(); count++, itr++) {
-	  printf("%3d %s\n    %s Bytes\n", count, itr->path.c_str(),
+	  printf("%3d|%s\n   |%s Bytes\n", count, itr->path.c_str(),
 		 Util::llitos(itr->length, true).c_str());
-	  cout << "-------------------------------------------------------------------------------" << endl;
+	  cout << "---+---------------------------------------------------------------------------" << endl;
 	}
 	exit(0);
       } else {