tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "adb: don\'t divide by zero" am: 1702f427b5 am: e53fadf4b3

Browse source 
am: 9f941b96f5

* commit '9f941b96f52e975e97f3f3c41bc5d931fe8fb0e6':
  adb: don't divide by zero
This commit is contained in:
Josh Gao 2015-12-02 22:09:56 +00:00 committed by android-build-merger
commit f681478787
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
adb/file_sync_client.cpp
View file

@ -185,8 +185,15 @@ class SyncConnection {
total_bytes += bytes_read;
bytes_copied += bytes_read;
int percentage = static_cast<int>(bytes_copied * 100 / total_size);
Printf("%s: %d%%", rpath, percentage);
if (total_size == 0) {
// This case can happen if we're racing against something that wrote to the file
// between our stat and our read, or if we're reading a magic file that lies about
// its size.
Printf("%s: ?%%", rpath);
} else {
int percentage = static_cast<int>(bytes_copied * 100 / total_size);
Printf("%s: %d%%", rpath, percentage);
}
}
adb_close(lfd);
@ -472,8 +479,14 @@ static bool sync_recv(SyncConnection& sc, const char* rpath, const char* lpath)
bytes_copied += msg.data.size;
int percentage = static_cast<int>(bytes_copied * 100 / size);
sc.Printf("%s: %d%%", rpath, percentage);
if (size == 0) {
// This case can happen if we're racing against something that wrote to the file between
// our stat and our read, or if we're reading a magic file that lies about its size.
sc.Printf("%s: ?%%", rpath);
} else {
int percentage = static_cast<int>(bytes_copied * 100 / size);
sc.Printf("%s: %d%%", rpath, percentage);
}
}
adb_close(lfd);