Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a45f945 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

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

am: 4b09d2f0

* commit '4b09d2f0':
  adb: don't append a slash to a path that already ends with one.
parents 2b012f20 4b09d2f0

adb/file_sync_client.cpp

+5 −2
Original line number Diff line number Diff line
@@ -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);