From dbee61db43a032861e7ecb57726108f9f31c726d Mon Sep 17 00:00:00 2001 From: David Wagner Date: Tue, 20 Dec 2011 14:59:29 +0000 Subject: [PATCH] Correctly handle input files beginning with several newlines Also, fix some comments (minor) Signed-off-by: David Wagner --- tools/mkenvimage.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 8ee2bd00e5..f78173163f 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -213,18 +213,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'; -- 2.30.2