Correctly handle input files beginning with several newlines
Also, fix some comments (minor)
Signed-off-by: David Wagner <david.wagner@free-electrons.com>
diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c
index 8ee2bd0..f781731 100644
--- a/tools/mkenvimage.c
+++ b/tools/mkenvimage.c
@@ -213,18 +213,18 @@
/* 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';