From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Sun, 22 Feb 2004 03:33:53 +0000 (-0000)
Subject: Ptch by Hideki IWAMOTO, fix a bug preventing tftp from getting or
X-Git-Tag: 1_00_pre8~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c699778fbba188cd3ba1c654f041fd61f1eb6ab8;p=oweals%2Fbusybox.git

Ptch by Hideki IWAMOTO, fix a bug preventing tftp from getting or
putting more than 0xffff blocks.
---

diff --git a/networking/tftp.c b/networking/tftp.c
index 146857686..0bc562dd0 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -156,7 +156,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
 	int opcode = 0;
 	int finished = 0;
 	int timeout = bb_tftp_num_retries;
-	int block_nr = 1;
+	unsigned short block_nr = 1;
 
 #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
 	int want_option_ack = 0;
@@ -462,7 +462,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
 		if (cmd_put && (opcode == TFTP_ACK)) {
 
-			if (tmp == (block_nr - 1)) {
+			if (tmp == (unsigned short)(block_nr - 1)) {
 				if (finished) {
 					break;
 				}