projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
938c29f
)
tools: env: fw_parse_script: simplify removal of newline/carriage return
author
Andreas Fenkart
<andreas.fenkart@digitalstrom.com>
Fri, 11 Mar 2016 08:39:38 +0000
(09:39 +0100)
committer
Tom Rini
<trini@konsulko.com>
Sat, 26 Mar 2016 22:49:29 +0000
(18:49 -0400)
fgets returns when the first '\n' is found
Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
tools/env/fw_env.c
patch
|
blob
|
history
diff --git
a/tools/env/fw_env.c
b/tools/env/fw_env.c
index
60574f2
..
5c7505c
100644
(file)
--- 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;
/*