PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MTP Fix rename in Windows

Browse Source 
Change-Id: Ieef2fc16aac1da3d03908cfb285895954b42a14a
This commit is contained in:
Dees Troy
2014-09-04 15:00:57 +00:00
parent 53ea0a166c
commit 2e07c0493e
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mtp/MtpStorage.cpp
View File

@@ -644,7 +644,7 @@ int MtpStorage::renameObject(MtpObjectHandle handle, std::string newName) {
std::string newFullName = parentdir + "/" + newName;
MTPD("old: '%s', new: '%s'\n", oldName.c_str(), newFullName.c_str());
if (rename(oldName.c_str(), newFullName.c_str()) == 0) {
node->setPath(newFullName);
node->rename(newFullName);
return 0;
} else {
MTPE("MtpStorage::renameObject failed, handle: %d, new name: '%s'\n", handle, newName.c_str());

1
mtp/btree.hpp
View File

@@ -36,6 +36,7 @@ public:
Node();
void setMtpid(int aMtpid);
void setPath(std::string aPath);
void rename(std::string aPath);
void setLeft(Node* aLeft);
void setRight(Node* aRight);
void setParent(Node* aParent);

6
mtp/node.cpp
View File

@@ -44,6 +44,12 @@ Node::Node() {
void Node::setMtpid(int aMtpid) { mtpid = aMtpid; }
void Node::setPath(std::string aPath) { path = aPath; }
void Node::rename(std::string aPath) {
path = aPath;
updateProperty(MTP_PROPERTY_OBJECT_FILE_NAME, 0, basename(aPath.c_str()), MTP_TYPE_STR);
updateProperty(MTP_PROPERTY_NAME, 0, basename(aPath.c_str()), MTP_TYPE_STR);
updateProperty(MTP_PROPERTY_DISPLAY_NAME, 0, basename(aPath.c_str()), MTP_TYPE_STR);
}
void Node::setLeft(Node* aLeft) { left = aLeft; }
void Node::setRight(Node* aRight) { right = aRight; }
void Node::setParent(Node* aParent) { parent = aParent; }