V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

tools: env: fw_parse_script: simplify removal of newline/carriage return 

fgets returns when the first '\n' is found

Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
This commit is contained in:
Andreas Fenkart 2016-03-11 09:39:38 +01:00 committed by Tom Rini
parent 938c29ff41
commit 69067a34b1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/env/fw_env.c vendored
View File

@ -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;
/*