openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Make "fastboot update" respect $TMPDIR." am: 8e0ccc9ff3 am: 8e0ded0c6c 

am: d38d487304

Change-Id: I61e6f9833c37529ef772ab091101a0e85856ffa7
This commit is contained in:
Elliott Hughes 2017-04-27 15:57:53 +00:00 committed by android-build-merger
parent f7e92a235f d38d487304
commit 7f95f97bdd
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fastboot/fastboot.cpp
View File

@ -494,8 +494,7 @@ static void* load_bootable_image(const char* kernel, const char* ramdisk,
return bdata;
}
static void* unzip_file(ZipArchiveHandle zip, const char* entry_name, int64_t* sz)
{
static void* unzip_file(ZipArchiveHandle zip, const char* entry_name, int64_t* sz) {
ZipString zip_entry_name(entry_name);
ZipEntry zip_entry;
if (FindEntry(zip, zip_entry_name, &zip_entry) != 0) {
@ -505,6 +504,7 @@ static void* unzip_file(ZipArchiveHandle zip, const char* entry_name, int64_t* s
*sz = zip_entry.uncompressed_length;
fprintf(stderr, "extracting %s (%" PRId64 " MB)...\n", entry_name, *sz / 1024 / 1024);
uint8_t* data = reinterpret_cast<uint8_t*>(malloc(zip_entry.uncompressed_length));
if (data == nullptr) {
fprintf(stderr, "failed to allocate %" PRId64 " bytes for '%s'\n", *sz, entry_name);
@ -553,22 +553,39 @@ static std::string make_temporary_directory() {
return "";
}
static int make_temporary_fd() {
// TODO: reimplement to avoid leaking a FILE*.
return fileno(tmpfile());
}
#else
static std::string make_temporary_template() {
const char* tmpdir = getenv("TMPDIR");
if (tmpdir == nullptr) tmpdir = P_tmpdir;
return std::string(tmpdir) + "/fastboot_userdata_XXXXXX";
}
static std::string make_temporary_directory() {
const char *tmpdir = getenv("TMPDIR");
if (tmpdir == nullptr) {
tmpdir = P_tmpdir;
}
std::string result = std::string(tmpdir) + "/fastboot_userdata_XXXXXX";
if (mkdtemp(&result[0]) == NULL) {
fprintf(stderr, "Unable to create temporary directory: %s\n",
strerror(errno));
std::string result(make_temporary_template());
if (mkdtemp(&result[0]) == nullptr) {
fprintf(stderr, "Unable to create temporary directory: %s\n", strerror(errno));
return "";
}
return result;
}
static int make_temporary_fd() {
std::string path_template(make_temporary_template());
int fd = mkstemp(&path_template[0]);
if (fd == -1) {
fprintf(stderr, "Unable to create temporary file: %s\n", strerror(errno));
return -1;
}
unlink(path_template.c_str());
return fd;
}
#endif
static std::string create_fbemarker_tmpdir() {
@ -603,8 +620,8 @@ static void delete_fbemarker_tmpdir(const std::string& dir) {
}
static int unzip_to_file(ZipArchiveHandle zip, char* entry_name) {
FILE* fp = tmpfile();
if (fp == nullptr) {
unique_fd fd(make_temporary_fd());
if (fd == -1) {
fprintf(stderr, "failed to create temporary file for '%s': %s\n",
entry_name, strerror(errno));
return -1;
@ -614,21 +631,20 @@ static int unzip_to_file(ZipArchiveHandle zip, char* entry_name) {
ZipEntry zip_entry;
if (FindEntry(zip, zip_entry_name, &zip_entry) != 0) {
fprintf(stderr, "archive does not contain '%s'\n", entry_name);
fclose(fp);
return -1;
}
int fd = fileno(fp);
fprintf(stderr, "extracting %s (%" PRIu32 " MB)...\n", entry_name,
zip_entry.uncompressed_length / 1024 / 1024);
int error = ExtractEntryToFile(zip, &zip_entry, fd);
if (error != 0) {
fprintf(stderr, "failed to extract '%s': %s\n", entry_name, ErrorCodeString(error));
fclose(fp);
return -1;
}
lseek(fd, 0, SEEK_SET);
// TODO: We're leaking 'fp' here.
return fd;
return fd.release();
}
static char *strip(char *s)
@ -1151,7 +1167,7 @@ static void do_update(Transport* transport, const char* filename, const std::str
}
flash_buf(partition.c_str(), &buf);
/* not closing the fd here since the sparse code keeps the fd around
* but hasn't mmaped data yet. The tmpfile will get cleaned up when the
* but hasn't mmaped data yet. The temporary file will get cleaned up when the
* program exits.
*/
};
@ -1412,7 +1428,8 @@ static void fb_perform_format(Transport* transport,
return;
}
fd = fileno(tmpfile());
fd = make_temporary_fd();
if (fd == -1) return;
unsigned eraseBlkSize, logicalBlkSize;
eraseBlkSize = fb_get_flash_block_size(transport, "erase-block-size");