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

Commit f6e65e3f authored by Josh Gao's avatar Josh Gao
Browse files

adb: don't use adb_dirname in between getting and printing errno. 

adb_dirname might trample over the errno value we want to print. Move
the adb_dirname call out to a local to prevent this.

Change-Id: I8a62cb2e1be8704225a9c3b72dd01259c7eaaae4
parent c40f213b

adb/file_sync_client.cpp

+3 −3
Original line number Diff line number Diff line
@@ -403,9 +403,9 @@ static bool sync_recv(SyncConnection& sc, const char* rpath, const char* lpath) 
    if (!sc.SendRequest(ID_RECV, rpath)) return false;



    adb_unlink(lpath);

    if (!mkdirs(adb_dirname(lpath))) {

        sc.Error("failed to create parent directory '%s': %s",

                 adb_dirname(lpath).c_str(), strerror(errno));

    const std::string dirpath = adb_dirname(lpath);

    if (!mkdirs(dirpath.c_str())) {

        sc.Error("failed to create parent directory '%s': %s", dirpath.c_str(), strerror(errno));

        return false;

    }