mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-06 15:20:12 +00:00
Code Issues Projects Releases Wiki Activity

tftp-hpa: bug fix on separated CR and LF

Browse Source 
In ascii mode, if the CR and LF was separated into different transfer
blocks, This LF will be just dropped instead of replacing the previous
CR. Add a checking on the first character to fix it.

Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Zhang Xiao
2014-06-11 14:53:37 +08:00
committed by Joe MacDonald
parent f135f64596
commit d42a2e1605
2 changed files with 39 additions and 0 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-separated-CR-and-LF.patch
+38
View File
@@ -0,0 +1,38 @@
From 6ed1eb8829dee351b54e183bc42c007cb306aaa5 Mon Sep 17 00:00:00 2001
From: Zhang Xiao <xiao.zhang@windriver.com>
Date: Wed, 11 Jun 2014 14:01:16 +0800
Subject: [PATCH] tftp-hpa: bug fix on separated CR and LF
In ascii mode, if the CR and LF was separated into different transfer
blocks, LF will be just dropped instead of replacing the previous CR.
Add a checking on the first character to fix it.
Upstream-Status: pending
Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
---
common/tftpsubs.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/common/tftpsubs.c b/common/tftpsubs.c
index b4d4ffe..b4ea3f2 100644
--- a/common/tftpsubs.c
+++ b/common/tftpsubs.c
@@ -207,6 +207,14 @@ int write_behind(FILE * file, int convert)
p = buf;
ct = count;
count = 0;
+
+ /* Check the first character together with prevchar */
+ c = *p;
+ if ((prevchar == '\r') && (c == '\n')) {
+ lseek(fileno(file), -1, SEEK_CUR);
+ count++;
+ }
+
while (ct--) { /* loop over the buffer */
c = *p++; /* pick up a character */
if (prevchar == '\r') { /* if prev char was cr */
--
1.8.5.2.233.g932f7e4
meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
+1
View File
@@ -24,6 +24,7 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t
file://default \
file://init \
file://add-error-check-for-disk-filled-up.patch \
file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \
"
SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21"