summaryrefslogtreecommitdiff
path: root/futility/cmd_vbutil_kernel.c
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2015-01-30 12:22:28 -0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-01-31 05:42:48 +0000
commit2559338dbdacbcbd3ae426337403196135bbc7e8 (patch)
treefb87c9b5b7058e14349f16cac2dc81966942ea87 /futility/cmd_vbutil_kernel.c
parent65ce99b3e2c75bbb416b6edf78b5ea0d7f8c3a94 (diff)
downloadvboot-2559338dbdacbcbd3ae426337403196135bbc7e8.tar.gz
futility: refactor file type detection into new files
This moves the what-kind-of-file-is-this logic into a separate file, and makes it work by calling distinct recognizers until one hits. A new "-t" option to the show command prints what it's doing. BUG=chromium:228932 BRANCH=ToT TEST=make runtests Change-Id: Id8f60bdf3fe6a9adf41b4555b3448a261fa52fea Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/245122 Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'futility/cmd_vbutil_kernel.c')
-rw-r--r--futility/cmd_vbutil_kernel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c
index 40deba9e..65a9af39 100644
--- a/futility/cmd_vbutil_kernel.c
+++ b/futility/cmd_vbutil_kernel.c
@@ -18,6 +18,7 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "file_type.h"
#include "futility.h"
#include "host_common.h"
#include "kernel_blob.h"
@@ -464,7 +465,7 @@ static int do_vbutil_kernel(int argc, char *argv[])
/* Make sure we have a kernel partition */
if (FILE_TYPE_KERN_PREAMBLE !=
- futil_what_file_type_buf(kpart_data, kpart_size))
+ futil_file_type_buf(kpart_data, kpart_size))
Fatal("%s is not a kernel blob\n", oldfile);
kblob_data = UnpackKPart(kpart_data, kpart_size, opt_pad,