summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath2002-12-19 20:16:22 +0000
committerGlenn L McGrath2002-12-19 20:16:22 +0000
commit0f18271a8a565f003790a2cf6a8426308e0d229c (patch)
tree443dfa36024edd0887135a4a9dadbceb43fd2d15
parent1643f419868dc245f88f35a1fda8b7ac8b66b6b6 (diff)
downloadbusybox-0f18271a8a565f003790a2cf6a8426308e0d229c.zip
busybox-0f18271a8a565f003790a2cf6a8426308e0d229c.tar.gz
Bugfix, wastn retrieving last block, patch by Jean-Christophe Dubois
-rw-r--r--networking/tftp.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/networking/tftp.c b/networking/tftp.c
index a3808f5..378ba2f 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -279,8 +279,6 @@ static inline int tftp(const int cmd, const struct hostent *host,
}
cp += len;
- } else if (finished) {
- break;
}
}
@@ -306,8 +304,11 @@ static inline int tftp(const int cmd, const struct hostent *host,
}
- /* receive packet */
+ if (finished) {
+ break;
+ }
+ /* receive packet */
memset(&from, 0, sizeof(from));
fromlen = sizeof(from);
@@ -359,7 +360,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
} while (timeout && (len >= 0));
- if (len < 0) {
+ if ((finished) || (len < 0)) {
break;
}