[axel-commits] r74 - /branches/2.x/CHANGES /branches/2.x/axel.c /trunk/CHANGES /trunk/axel.c

[phihag-guest at users.alioth.debian.org]

Author: phihag-guest
Date: Mon Dec 29 12:09:22 2008
New Revision: 74

URL: http://svn.debian.org/wsvn/axel/?sc=1&rev=74
Log:
- Fix LFS support (Closes: #311324)


Modified:
    branches/2.x/CHANGES
    branches/2.x/axel.c
    trunk/CHANGES
    trunk/axel.c

Modified: branches/2.x/CHANGES
URL: http://svn.debian.org/wsvn/axel/branches/2.x/CHANGES?rev=74&op=diff
==============================================================================
--- branches/2.x/CHANGES (original)
+++ branches/2.x/CHANGES Mon Dec 29 12:09:22 2008
@@ -3,6 +3,7 @@
 - Wait for thread termination in axel.c:axel_do (Closes: #311255), thanks John Ripa
 - New Chinese translation and manpage, thanks Shuge Lee
 - Fix LFS support for FTP (Closes: #311320)
+- Fix LFS support (Closes: #311324)
 
 Version 2.2:
 

Modified: branches/2.x/axel.c
URL: http://svn.debian.org/wsvn/axel/branches/2.x/axel.c?rev=74&op=diff
==============================================================================
--- branches/2.x/axel.c (original)
+++ branches/2.x/axel.c Mon Dec 29 12:09:22 2008
@@ -261,8 +261,8 @@
 void axel_do( axel_t *axel )
 {
 	fd_set fds[1];
-	int hifd, i, j;
-	long long int size;
+	int hifd, i;
+	long long int remaining,size;
 	struct timeval timeval[1];
 	
 	/* Create statefile if necessary				*/
@@ -340,9 +340,9 @@
 			conn_disconnect( &axel->conn[i] );
 			continue;
 		}
-		/* j == Bytes to go					*/
-		j = axel->conn[i].lastbyte - axel->conn[i].currentbyte + 1;
-		if( j < size )
+		/* remaining == Bytes to go					*/
+		remaining = axel->conn[i].lastbyte - axel->conn[i].currentbyte + 1;
+		if( remaining < size )
 		{
 			if( axel->conf->verbose )
 			{
@@ -350,7 +350,7 @@
 			}
 			axel->conn[i].enabled = 0;
 			conn_disconnect( &axel->conn[i] );
-			size = j;
+			size = remaining;
 			/* Don't terminate, still stuff to write!	*/
 		}
 		/* This should always succeed..				*/

Modified: trunk/CHANGES
URL: http://svn.debian.org/wsvn/axel/trunk/CHANGES?rev=74&op=diff
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Mon Dec 29 12:09:22 2008
@@ -2,6 +2,7 @@
 
 - Wait for thread termination in axel.c:axel_do (Closes: #311255), thanks John Ripa
 - Fix LFS support for FTP (Closes: #311320)
+- Fix LFS support (Closes: #311324)
 
 Version 2.2:
 

Modified: trunk/axel.c
URL: http://svn.debian.org/wsvn/axel/trunk/axel.c?rev=74&op=diff
==============================================================================
--- trunk/axel.c (original)
+++ trunk/axel.c Mon Dec 29 12:09:22 2008
@@ -261,8 +261,8 @@
 void axel_do( axel_t *axel )
 {
 	fd_set fds[1];
-	int hifd, i, j;
-	long long int size;
+	int hifd, i;
+	long long int remaining,size;
 	struct timeval timeval[1];
 	
 	/* Create statefile if necessary				*/
@@ -340,9 +340,9 @@
 			conn_disconnect( &axel->conn[i] );
 			continue;
 		}
-		/* j == Bytes to go					*/
-		j = axel->conn[i].lastbyte - axel->conn[i].currentbyte + 1;
-		if( j < size )
+		/* remaining == Bytes to go					*/
+		remaining = axel->conn[i].lastbyte - axel->conn[i].currentbyte + 1;
+		if( remaining < size )
 		{
 			if( axel->conf->verbose )
 			{
@@ -350,7 +350,7 @@
 			}
 			axel->conn[i].enabled = 0;
 			conn_disconnect( &axel->conn[i] );
-			size = j;
+			size = remaining;
 			/* Don't terminate, still stuff to write!	*/
 		}
 		/* This should always succeed..				*/