mir/MEGAcmd
2
0
Fork 0
mirror of https://github.com/meganz/MEGAcmd synced 2025-08-22 01:47:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #362 from meganz/fix/put-local-path-trailing-slash

Browse Source 
#15405: allow "put /local/path/ /newpath"
This commit is contained in:
polmr 2020-05-19 18:20:54 +02:00 committed by GitHub
commit d3cc8d884f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/megacmdcommonutils.cpp
View File

@ -267,6 +267,11 @@ std::string &rtrim(std::string &s, const char &c)
return s;
}
string removeTrailingSeparators(string &path)
{
return rtrim(rtrim(path,'/'),'\\');
}
vector<string> getlistOfWords(char *ptr, bool escapeBackSlashInCompletion, bool ignoreTrailingSpaces)
{
vector<string> words;

2
src/megacmdcommonutils.h
View File

@ -139,6 +139,8 @@ std::string getPublicLinkHandle(const std::string &link);
bool hasWildCards(std::string &what);
std::string removeTrailingSeparators(std::string &path);
/* Strings related */

5
src/megacmdexecuter.cpp
View File

@ -3148,11 +3148,12 @@ void MegaCmdExecuter::uploadNode(string path, MegaApi* api, MegaNode *node, stri
if (newname.size())
{
api->startUpload(path.c_str(), node, newname.c_str(), thelistener);
api->startUpload(removeTrailingSeparators(path).c_str(), node, newname.c_str(), thelistener);
}
else
{
api->startUpload(path.c_str(), node, thelistener);
api->startUpload(removeTrailingSeparators(path).c_str(), node, thelistener);
}
if (megaCmdTransferListener)
{