[oe-commits] Roy.Li : Revert "tftp-hpa: bug fix on empty file put error"

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 15ccbddc6db99689548b518160ad26e1bdc37261
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=15ccbddc6db99689548b518160ad26e1bdc37261

Author: Roy.Li <rongqing.li at windriver.com>
Date:   Fri Oct 17 13:24:23 2014 +0800

Revert "tftp-hpa: bug fix on empty file put error"

This reverts commit b2eb21a5fbcb065e84ed582e87de21bdc3082f00.

It make 3d8520a0b411[tftp-hpa: add error check for disk filled up]
unable to work

Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>

---

 .../tftp-hpa-bug-fix-on-empty-file-put-error.patch | 33 ----------------------
 .../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb       |  1 -
 2 files changed, 34 deletions(-)

diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch
deleted file mode 100644
index aa29d9c..0000000
--- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-tftp-hpa: bug fix on empty file put error
-
-With the feature that checking the disk filled up, the return value of
-function write_behind was checked and used to detect the disk status.
-While for empty file, without data being written, this function will
-return -1 thus the disk filled up error was miss-raised. Fix it.
-
-Upstream-Status: pending
-
-Signed-off-by: Zhang Xiao <xiao.zhang at windriver.com>
----
- tftpd/tftpd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
---- a/tftpd/tftpd.c
-+++ b/tftpd/tftpd.c
-@@ -1692,7 +1692,7 @@ static void tftp_recvfile(const struct f
-             syslog(LOG_WARNING, "tftpd: write(ack): %m");
-             goto abort;
-         }
--        if(write_behind(file, pf->f_convert) < 0) {
-+        if(write_behind(file, pf->f_convert) < -1) {
-             nak(ENOSPACE, NULL);
-             (void)fclose(file);
-             goto abort;
-@@ -1727,7 +1727,7 @@ static void tftp_recvfile(const struct f
-             goto abort;
-         }
-     } while (size == segsize);
--    if(write_behind(file, pf->f_convert) < 0) {
-+    if(write_behind(file, pf->f_convert) < -1) {
-         nak(ENOSPACE, NULL);
-         (void)fclose(file);
-         goto abort;
diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
index e58a4b1..1951747 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
+++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
@@ -25,7 +25,6 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t
            file://init \
            file://add-error-check-for-disk-filled-up.patch \
            file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \
-           file://tftp-hpa-bug-fix-on-empty-file-put-error.patch \
 "
 
 SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21"