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

Merge "adb: don\'t append a slash to a path that already ends with one." am: aae1eb2c4f

Browse source 
am: 4b09d2f084

* commit '4b09d2f084dfe2df3314a10c59090be2c97b9a9e':
  adb: don't append a slash to a path that already ends with one.
This commit is contained in:
Josh Gao 2016-02-04 02:35:31 +00:00 committed by android-build-merger
commit 3a45f945c7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/file_sync_client.cpp
View file

@ -753,8 +753,11 @@ bool do_sync_push(const std::vector<const char*>& srcs, const char* dst) {
if (dst_isdir) {
// If we're copying a local file to a remote directory,
// we really want to copy to remote_dir + "/" + local_filename.
path_holder = android::base::StringPrintf(
"%s/%s", dst_path, adb_basename(src_path).c_str());
path_holder = dst_path;
if (path_holder.back() != '/') {
path_holder.push_back('/');
}
path_holder += adb_basename(src_path);
dst_path = path_holder.c_str();
}
sc.SetExpectedTotalBytes(st.st_size);