[git commit master] tftp: another small tweak

Denys Vlasenko vda.linux at googlemail.com
Sun Nov 8 17:15:10 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=1e9ac9f6853abb645c8d4a480d4ad6f09d7a8588
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/tftp.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/networking/tftp.c b/networking/tftp.c
index cd5e50c..eddb148 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -561,11 +561,11 @@ static int tftp_protocol(
 					io_bufsize = blksize + 4;
 				}
 # if ENABLE_FEATURE_TFTP_PROGRESS_BAR
-				if (G.size == 0) { /* if we don't know it yet */
+				if (remote_file && G.size == 0) { /* if we don't know it yet */
 					res = tftp_get_option("tsize", &rbuf[2], len - 2);
 					if (res) {
 						G.size = bb_strtoull(res, NULL, 10);
-						if (remote_file && G.size)
+						if (G.size)
 							tftp_progress_init();
 					}
 				}
@@ -579,8 +579,8 @@ static int tftp_protocol(
 			}
 			/* rfc2347:
 			 * "An option not acknowledged by the server
-			 *  must be ignored by the client and server
-			 *  as if it were never requested." */
+			 * must be ignored by the client and server
+			 * as if it were never requested." */
 			bb_error_msg("server only supports blocksize of 512");
 			blksize = TFTP_BLKSIZE_DEFAULT;
 			io_bufsize = TFTP_BLKSIZE_DEFAULT + 4;
-- 
1.6.3.3



More information about the busybox-cvs mailing list