Patchwork [U-Boot,09/10] Correctly handle input files beginning with several newlines

login
register
mail settings
Submitter David Wagner
Date Dec. 21, 2011, 12:59 a.m.
Message ID <1324429169-10177-1-git-send-email-david.wagner@free-electrons.com>
Download mbox | patch
Permalink /patch/132545/
State Accepted
Commit dbee61db43a032861e7ecb57726108f9f31c726d
Headers show

Comments

David Wagner - Dec. 21, 2011, 12:59 a.m.
Also, fix some comments (minor)

Signed-off-by: David Wagner <david.wagner@free-electrons.com>
---
 tools/mkenvimage.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
Wolfgang Denk - Jan. 5, 2012, 4:24 p.m.
Dear David Wagner,

In message <1324429169-10177-1-git-send-email-david.wagner@free-electrons.com> you wrote:
> Also, fix some comments (minor)
> 
> Signed-off-by: David Wagner <david.wagner@free-electrons.com>
> ---
>  tools/mkenvimage.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c
index 9899631..0c9194b 100644
--- a/tools/mkenvimage.c
+++ b/tools/mkenvimage.c
@@ -224,18 +224,18 @@  int main(int argc, char **argv)
 	/* Replace newlines separating variables with \0 */
 	for (fp = 0, ep = 0 ; fp < filesize ; fp++) {
 		if (filebuf[fp] == '\n') {
-			if (fp == 0) {
+			if (ep == 0) {
 				/*
-				 * Newline at the beginning of the file ?
-				 * Ignore it.
+				 * Newlines at the beginning of the file ?
+				 * Ignore them.
 				 */
 				continue;
 			} else if (filebuf[fp-1] == '\\') {
 				/*
 				 * Embedded newline in a variable.
 				 *
-				 * The backslash was added to the envptr ;
-				 * rewind and replace it with a newline
+				 * The backslash was added to the envptr; rewind
+				 * and replace it with a newline
 				 */
 				ep--;
 				envptr[ep++] = '\n';