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

Commit ccb6e961 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MTP: Delete all files and subdirectories when deleting directories. 



Children are now recursively deleted from the database and filesystem.

Change-Id: Ifd9b48cbc34b84b8f5073f2493dfe9735fae5492
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent f4cae9f9

media/java/android/media/MtpDatabase.java

+16 −2
Original line number Diff line number Diff line
@@ -478,12 +478,26 @@ public class MtpDatabase { 
        }

    }



    private int deleteRecursive(int handle) throws RemoteException {

        int[] children = getObjectList(0 /* storageID */, 0 /* format */, handle);

        Uri uri = Files.getMtpObjectsUri(mVolumeName, handle);

        // delete parent first, to avoid potential infinite recursion

        int count = mMediaProvider.delete(uri, null, null);

        if (count == 1) {

            if (children != null) {

                for (int i = 0; i < children.length; i++) {

                    count += deleteRecursive(children[i]);

                }

            }

        }

        return count;

    }



    private int deleteFile(int handle) {

        Log.d(TAG, "deleteFile: " + handle);

        mDatabaseModified = true;

        Uri uri = Files.getMtpObjectsUri(mVolumeName, handle);

        try {

            if (mMediaProvider.delete(uri, null, null) == 1) {

            if (deleteRecursive(handle) > 0) {

                return MtpConstants.RESPONSE_OK;

            } else {

                return MtpConstants.RESPONSE_INVALID_OBJECT_HANDLE;

media/mtp/MtpServer.cpp

+63 −5
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <sys/stat.h>

#include <fcntl.h>

#include <errno.h>

#include <sys/stat.h>

#include <dirent.h>



#include <cutils/properties.h>
@@ -686,21 +688,77 @@ done: 
    return result;

}



static void deleteRecursive(const char* path) {

    char pathbuf[PATH_MAX];

    int pathLength = strlen(path);

    if (pathLength >= sizeof(pathbuf) - 1) {

        LOGE("path too long: %s\n", path);

    }

    strcpy(pathbuf, path);

    if (pathbuf[pathLength - 1] != '/') {

        pathbuf[pathLength++] = '/';

    }

    char* fileSpot = pathbuf + pathLength;

    int pathRemaining = sizeof(pathbuf) - pathLength - 1;



    DIR* dir = opendir(path);

    if (!dir) {

        LOGE("opendir %s failed: %s", path, strerror(errno));

        return;

    }



    struct dirent* entry;

    while ((entry = readdir(dir))) {

        const char* name = entry->d_name;



        // ignore "." and ".."

        if (name[0] == '.' && (name[1] == 0 || (name[1] == '.' && name[2] == 0))) {

            continue;

        }



        int nameLength = strlen(name);

        if (nameLength > pathRemaining) {

            LOGE("path %s/%s too long\n", path, name);

            continue;

        }

        strcpy(fileSpot, name);



        int type = entry->d_type;

        if (entry->d_type == DT_DIR) {

            deleteRecursive(pathbuf);

            rmdir(pathbuf);

        } else {

            unlink(pathbuf);

        }

    }

}



static void deletePath(const char* path) {

    struct stat statbuf;

    if (stat(path, &statbuf) == 0) {

        if (S_ISDIR(statbuf.st_mode)) {

            deleteRecursive(path);

            rmdir(path);

        } else {

            unlink(path);

        }

    } else {

        LOGE("deletePath stat failed for %s: %s", path, strerror(errno));

    }

}



MtpResponseCode MtpServer::doDeleteObject() {

    MtpObjectHandle handle = mRequest.getParameter(1);

    MtpObjectFormat format = mRequest.getParameter(1);

    MtpObjectFormat format = mRequest.getParameter(2);

    // FIXME - support deleting all objects if handle is 0xFFFFFFFF

    // FIXME - implement deleting objects by format

    // FIXME - handle non-empty directories



    MtpString filePath;

    int64_t fileLength;

    int result = mDatabase->getObjectFilePath(handle, filePath, fileLength);

    if (result == MTP_RESPONSE_OK) {

        LOGV("deleting %s", (const char *)filePath);

        // one of these should work

        rmdir((const char *)filePath);

        unlink((const char *)filePath);

        deletePath((const char *)filePath);

        return mDatabase->deleteFile(handle);

    } else {

        return result;