mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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@mentor.com>
This commit is contained in:
Roy.Li
2014-10-17 13:24:23 +08:00
committed by Joe MacDonald
parent 4851bb16c3
commit 15ccbddc6d
2 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch
-33
View File
@@ -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@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;
meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
-1
View File
@@ -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"