| Message ID | 1457685580-28276-5-git-send-email-andreas.fenkart@digitalstrom.com |
|---|---|
| State | Accepted |
| Commit | 69067a34b1ab1fb14f0183acb85358db60aac484 |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, Mar 11, 2016 at 09:39:38AM +0100, Andreas Fenkart wrote: > fgets returns when the first '\n' is found > > Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com> Applied to u-boot/master, thanks!
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 60574f2..5c7505c 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -566,14 +566,12 @@ int fw_parse_script(char *fname) } /* Drop ending line feed / carriage return */ - while (len > 0 && (dump[len - 1] == '\n' || - dump[len - 1] == '\r')) { - dump[len - 1] = '\0'; - len--; - } + dump[--len] = '\0'; + if (len && dump[len - 1] == '\r') + dump[--len] = '\0'; /* Skip comment or empty lines */ - if ((len == 0) || dump[0] == '#') + if (len == 0 || dump[0] == '#') continue; /*
fgets returns when the first '\n' is found Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com> --- tools/env/fw_env.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)