diff options
| author | David Wagner <david.wagner@free-electrons.com> | 2011-12-20 14:59:29 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-01-05 20:10:38 +0100 |
| commit | dbee61db43a032861e7ecb57726108f9f31c726d (patch) | |
| tree | 29168b82374331d978d0f225d6a34dda909e0361 | |
| parent | 627182ea9d0f157f7280aa650dd4c06461b20c3e (diff) | |
| download | olio-uboot-2014.01-dbee61db43a032861e7ecb57726108f9f31c726d.tar.xz olio-uboot-2014.01-dbee61db43a032861e7ecb57726108f9f31c726d.zip | |
Correctly handle input files beginning with several newlines
Also, fix some comments (minor)
Signed-off-by: David Wagner <david.wagner@free-electrons.com>
| -rw-r--r-- | tools/mkenvimage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 8ee2bd00e..f78173163 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'; |