[oe] [PATCH 1/2][meta-networking] Revert "tftp-hpa: bug fix on empty file put error"

[Joe MacDonald]

Merged, thanks.
-J.

[[oe] [PATCH 1/2][meta-networking] Revert "tftp-hpa: bug fix on empty file put error"] On 14.10.17 (Fri 13:24) rongqing.li at windriver.com wrote:

> From: "Roy.Li" <rongqing.li at windriver.com>
> 
> This reverts commit b2eb21a5fbcb065e84ed582e87de21bdc3082f00.
> 
> It make 3d8520a0b411[tftp-hpa: add error check for disk filled up]
> unable to work
> ---
>  .../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(-)
>  delete mode 100644 meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch
> 
> 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"
> -- 
> 1.7.10.4
> 
-- 
-Joe MacDonald.
:wq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20141021/c96b3cc1/attachment-0002.sig>