openharmony/filemanagement_app_file_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_app_file_service synced 2024-11-23 16:10:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Uri解码修改变量类型

Browse Source 
Signed-off-by: cuiruibin <cuiruibin3@huawei.com>
This commit is contained in:
cuiruibin 2024-04-17 10:16:02 +08:00
parent 1835099a63
commit bbfa08a5b9
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
interfaces/common/src/sandbox_helper.cpp
View File

@ -48,6 +48,7 @@ namespace {
const string LOCAL = "local";
const int ASSET_IN_BUCKET_NUM_MAX = 1000;
const int ASSET_DIR_START_NUM = 16;
const int DECODE_FORMAT_NUM = 16;
}
struct MediaUriInfo {
@ -87,23 +88,21 @@ string SandboxHelper::Encode(const string &uri)
string SandboxHelper::Decode(const string &uri)
{
std::ostringstream outPutStream;
std::string outPutStr;
const int32_t encodeLen = 2;
size_t index = 0;
while (index < uri.length()) {
if (uri[index] == '%') {
int hex = 0;
std::istringstream inputStream(uri.substr(index + 1, encodeLen));
inputStream >> std::hex >> hex;
outPutStream << static_cast<char>(hex);
std::string inputStr(uri.substr(index + 1, encodeLen));
outPutStr += static_cast<char>(strtol(inputStr.c_str(), nullptr, DECODE_FORMAT_NUM));
index += encodeLen + 1;
} else {
outPutStream << uri[index];
outPutStr += uri[index];
index++;
}
}
return outPutStream.str();
return outPutStr;
}
static string GetLowerPath(string &lowerPathHead, const string &lowerPathTail,

11
interfaces/innerkits/native/remote_file_share/src/remote_file_share.cpp
View File

@ -31,6 +31,7 @@
#include "sandbox_helper.h"
#include "securec.h"
#include "uri.h"
#include "unique_fd.h"
namespace OHOS {
namespace AppFileService {
@ -379,7 +380,7 @@ int32_t RemoteFileShare::GetDfsUriFromLocal(const std::string &uriStr, const int
InitHmdfsInfo(hdi, physicalPath, distributedPath, bundleName);
std::string ioctlDir = SHAER_PATH_HEAD + std::to_string(userId) + SHAER_PATH_MID;
int32_t dirFd = open(ioctlDir.c_str(), O_RDONLY);
UniqueFd dirFd(open(ioctlDir.c_str(), O_RDONLY));
if (dirFd < 0) {
LOGE("Open share path failed with %{public}d", errno);
return errno;
@ -388,11 +389,9 @@ int32_t RemoteFileShare::GetDfsUriFromLocal(const std::string &uriStr, const int
ret = ioctl(dirFd, HMDFS_IOC_GET_DST_PATH, &hdi);
if (ret != 0) {
LOGE("Ioctl failed with %{public}d", errno);
close(dirFd);
return -errno;
}
close(dirFd);
SetHmdfsUriInfo(hui, uri, hdi.size, networkId);
LOGD("GetDfsUriFromLocal successfully");
return 0;
@ -403,7 +402,7 @@ int32_t RemoteFileShare::GetDfsUrisFromLocal(const std::vector<std::string> &uri
std::unordered_map<std::string, HmdfsUriInfo> &uriToDfsUriMaps)
{
std::string ioctlDir = SHAER_PATH_HEAD + std::to_string(userId) + SHAER_PATH_MID;
int32_t dirFd = open(ioctlDir.c_str(), O_RDONLY);
UniqueFd dirFd(open(ioctlDir.c_str(), O_RDONLY));
if (dirFd < 0) {
LOGE("Open share path failed with %{public}d", errno);
return errno;
@ -416,7 +415,6 @@ int32_t RemoteFileShare::GetDfsUrisFromLocal(const std::vector<std::string> &uri
std::string physicalPath = GetPhysicalPath(uri, std::to_string(userId));
if (physicalPath == "") {
LOGE("Failed to get physical path");
close(dirFd);
return -EINVAL;
}
@ -432,7 +430,6 @@ int32_t RemoteFileShare::GetDfsUrisFromLocal(const std::vector<std::string> &uri
int ret = GetDistributedPath(uri, userId, distributedPath);
if (ret != 0) {
LOGE("Path is too long with %{public}d", ret);
close(dirFd);
return ret;
}
@ -441,14 +438,12 @@ int32_t RemoteFileShare::GetDfsUrisFromLocal(const std::vector<std::string> &uri
ret = ioctl(dirFd, HMDFS_IOC_GET_DST_PATH, &hdi);
if (ret != 0) {
LOGE("Ioctl failed with %{public}d", errno);
close(dirFd);
return -errno;
}
HmdfsUriInfo dfsUriInfo;
SetHmdfsUriInfo(dfsUriInfo, uri, hdi.size, networkId);
uriToDfsUriMaps.insert({uriStr, dfsUriInfo});
}
close(dirFd);
LOGD("GetDfsUriFromLocal successfully");
return 0;
}