Bugfix, wastn retrieving last block, patch by Jean-Christophe Dubois

diff --git a/networking/tftp.c b/networking/tftp.c
index a3808f5bfcd5f646aaeebf21a0adb682381a83d1..378ba2feff0d4daaf141db2a53048f0053b7b866 100644 (file)
--- 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;
                }