ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fastboot: better temporary file errors."

Browse source
This commit is contained in:
Elliott Hughes 2018-05-22 17:52:18 +00:00 • committed by Gerrit Code Review
commit 9971005cd3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fastboot/fastboot.cpp
View file

@ -507,7 +507,8 @@ static std::string make_temporary_template() {
static std::string make_temporary_directory() { static std::string make_temporary_directory() {
std::string result(make_temporary_template()); std::string result(make_temporary_template());
if (mkdtemp(&result[0]) == nullptr) { if (mkdtemp(&result[0]) == nullptr) {
die("unable to create temporary directory: %s", strerror(errno)); die("unable to create temporary directory with template %s: %s",
result.c_str(), strerror(errno));
} }
return result; return result;
} }
@ -516,7 +517,8 @@ static int make_temporary_fd(const char* what) {
std::string path_template(make_temporary_template()); std::string path_template(make_temporary_template());
int fd = mkstemp(&path_template[0]); int fd = mkstemp(&path_template[0]);
if (fd == -1) { if (fd == -1) {
die("failed to create temporary file for %s: %s\n", what, strerror(errno)); die("failed to create temporary file for %s with template %s: %s\n",
path_template.c_str(), what, strerror(errno));
} }
unlink(path_template.c_str()); unlink(path_template.c_str());
return fd; return fd;