summaryrefslogtreecommitdiffstats
path: root/fastboot
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-20 10:29:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-20 10:29:39 -0700
commitbb0d0721e6bc5dcedc9bbbac0ea8fa4e57f487ad (patch)
tree2066f18b7054b1f78c57d7df9023e58b28cbd7ce /fastboot
parentc3a4a054a99b62cb4fd593d95f3b2b0017202b20 (diff)
parent94938c9d60d6467ec40df4254beadc50bb787934 (diff)
downloadsystem_core-bb0d0721e6bc5dcedc9bbbac0ea8fa4e57f487ad.zip
system_core-bb0d0721e6bc5dcedc9bbbac0ea8fa4e57f487ad.tar.gz
system_core-bb0d0721e6bc5dcedc9bbbac0ea8fa4e57f487ad.tar.bz2
am 94938c9d: am ed2e672f: Merge "Print strerror for file read errors during flashing"
* commit '94938c9d60d6467ec40df4254beadc50bb787934': Print strerror for file read errors during flashing
Diffstat (limited to 'fastboot')
-rw-r--r--fastboot/fastboot.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 2a63905..898d452 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -157,6 +157,7 @@ void *load_file(const char *fn, unsigned *_sz)
char *data;
int sz;
int fd;
+ int errno_tmp;
data = 0;
fd = open(fn, O_RDONLY);
@@ -177,8 +178,10 @@ void *load_file(const char *fn, unsigned *_sz)
return data;
oops:
+ errno_tmp = errno;
close(fd);
if(data != 0) free(data);
+ errno = errno_tmp;
return 0;
}
#endif
@@ -313,7 +316,7 @@ void *load_bootable_image(unsigned page_size, const char *kernel, const char *ra
kdata = load_file(kernel, &ksize);
if(kdata == 0) {
- fprintf(stderr, "cannot load '%s'\n", kernel);
+ fprintf(stderr, "cannot load '%s': %s\n", kernel, strerror(errno));
return 0;
}
@@ -333,7 +336,7 @@ void *load_bootable_image(unsigned page_size, const char *kernel, const char *ra
if(ramdisk) {
rdata = load_file(ramdisk, &rsize);
if(rdata == 0) {
- fprintf(stderr,"cannot load '%s'\n", ramdisk);
+ fprintf(stderr,"cannot load '%s': %s\n", ramdisk, strerror(errno));
return 0;
}
}
@@ -579,7 +582,7 @@ void do_flash(usb_handle *usb, const char *pname, const char *fname)
} else {
unsigned int sz;
data = load_file(fname, &sz);
- if (data == 0) die("cannot load '%s'\n", fname);
+ if (data == 0) die("cannot load '%s': %s\n", fname, strerror(errno));
fb_queue_flash(pname, data, sz);
}
}
@@ -607,7 +610,7 @@ void do_update(char *fn)
fb_queue_query_save("product", cur_product, sizeof(cur_product));
zdata = load_file(fn, &zsize);
- if (zdata == 0) die("failed to load '%s'", fn);
+ if (zdata == 0) die("failed to load '%s': %s", fn, strerror(errno));
zip = init_zipfile(zdata, zsize);
if(zip == 0) die("failed to access zipdata in '%s'");
@@ -677,12 +680,12 @@ void do_flashall(void)
fname = find_item("info", product);
if (fname == 0) die("cannot find android-info.txt");
data = load_file(fname, &sz);
- if (data == 0) die("could not load android-info.txt");
+ if (data == 0) die("could not load android-info.txt: %s", strerror(errno));
setup_requirements(data, sz);
fname = find_item("boot", product);
data = load_file(fname, &sz);
- if (data == 0) die("could not load boot.img");
+ if (data == 0) die("could not load boot.img: %s", strerror(errno));
do_send_signature(fname);
fb_queue_flash("boot", data, sz);
@@ -695,7 +698,7 @@ void do_flashall(void)
fname = find_item("system", product);
data = load_file(fname, &sz);
- if (data == 0) die("could not load system.img");
+ if (data == 0) die("could not load system.img: %s", strerror(errno));
do_send_signature(fname);
fb_queue_flash("system", data, sz);
}
@@ -865,7 +868,7 @@ int main(int argc, char **argv)
} else if(!strcmp(*argv, "signature")) {
require(2);
data = load_file(argv[1], &sz);
- if (data == 0) die("could not load '%s'", argv[1]);
+ if (data == 0) die("could not load '%s': %s", argv[1], strerror(errno));
if (sz != 256) die("signature must be 256 bytes");
fb_queue_download("signature", data, sz);
fb_queue_command("signature", "installing signature");