projects
/
platform
/
upstream
/
gummiboot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c00787
)
setup: get_file_version() simplify logic
author
Kay Sievers
<kay@vrfy.org>
Sun, 17 Feb 2013 01:52:22 +0000
(
02:52
+0100)
committer
Kay Sievers
<kay@vrfy.org>
Sun, 17 Feb 2013 01:52:22 +0000
(
02:52
+0100)
src/setup/setup.c
patch
|
blob
|
history
diff --git
a/src/setup/setup.c
b/src/setup/setup.c
index
5f9f4cb
..
399f8db
100644
(file)
--- a/
src/setup/setup.c
+++ b/
src/setup/setup.c
@@
-289,13
+289,9
@@
static int get_file_version(FILE *f, char **v) {
if (buf == MAP_FAILED)
return -errno;
- s = memmem(buf, st.st_size, "#### LoaderInfo: ", 17);
+ s = memmem(buf, st.st_size
- 8
, "#### LoaderInfo: ", 17);
if (!s)
goto finish;
- if (st.st_size - (s - buf) < 8) {
- fprintf(stderr, "Malformed version string.\n");
- goto finish;
- }
s += 17;
e = memmem(s, st.st_size - (s - buf), " ####", 5);