Skip to content

Commit 1d96233

Browse files
fix spelling error
1 parent 9ba4872 commit 1d96233

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

file_controller.cc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void add_lock(const HttpRequestPtr &req, std::function<void(const HttpResponsePt
2222
callback(res);
2323
}
2424
}
25-
std::string shell_commons(const char *cmd)
25+
std::string shell_commands(const char *cmd)
2626
{
2727
char buffer[1280];
2828
std::string result = "";
@@ -45,10 +45,10 @@ std::string shell_commons(const char *cmd)
4545
return result;
4646
}
4747

48-
void commondsCtrl(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
48+
void commandsCtrl(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
4949
{
5050

51-
std::cout << "commondsCtrl" << std::endl;
51+
std::cout << "commandsCtrl" << std::endl;
5252
enum Command {
5353
tree,
5454
cp,
@@ -68,17 +68,17 @@ void commondsCtrl(const HttpRequestPtr &req, std::function<void(const HttpRespon
6868
switch (command)
6969
{
7070
case tree:
71-
result = shell_commons(("cd " + std::string(pathvar) + "/.. " + "&&" + "tree -J root").c_str());
71+
result = shell_commands(("cd " + std::string(pathvar) + "/.. " + "&&" + "tree -J root").c_str());
7272
break;
7373
case cp:
74-
result = shell_commons(("cp -v " + std::string(pathvar) + "/../root/" + params1 + " " + std::string(pathvar) + "/../root/" + params2).c_str());
74+
result = shell_commands(("cp -v " + std::string(pathvar) + "/../root/" + params1 + " " + std::string(pathvar) + "/../root/" + params2).c_str());
7575
if(result!="")
7676
result = "success";
7777
else
7878
result = "error: in cp" ;
7979
break;
8080
case mv:
81-
result = shell_commons(("mv -v " + std::string(pathvar) + "/../root/" + params1 + " " + std::string(pathvar) + "/../root/" + params2).c_str());
81+
result = shell_commands(("mv -v " + std::string(pathvar) + "/../root/" + params1 + " " + std::string(pathvar) + "/../root/" + params2).c_str());
8282
if(result!="")
8383
result = "success";
8484
else
@@ -89,23 +89,23 @@ void commondsCtrl(const HttpRequestPtr &req, std::function<void(const HttpRespon
8989
result = "error:result in wrong directory";
9090
break;
9191
}
92-
result = shell_commons(("rm -rf -v " + std::string(pathvar) + "/../root/" + params1).c_str());
92+
result = shell_commands(("rm -rf -v " + std::string(pathvar) + "/../root/" + params1).c_str());
9393
if(result!="")
9494
result = "success";
9595
else
9696
result = "error: in rm" ;
9797
break;
9898
case mkdir:
99-
result = shell_commons(("mkdir -v " + std::string(pathvar) + "/../root/" + params1).c_str());
99+
result = shell_commands(("mkdir -v " + std::string(pathvar) + "/../root/" + params1).c_str());
100100
if(result!="")
101101
result = "success";
102102
else
103103
result = "error: in mkdir" ;
104104
break;
105105
case touch:
106-
if("" == shell_commons(("ls -l " + std::string(pathvar) + "/../root/" + params1 + " grep ^- ").c_str()))
106+
if("" == shell_commands(("ls -l " + std::string(pathvar) + "/../root/" + params1 + " grep ^- ").c_str()))
107107
{
108-
result = shell_commons(("touch " + std::string(pathvar) + "/../root/" + params1).c_str());
108+
result = shell_commands(("touch " + std::string(pathvar) + "/../root/" + params1).c_str());
109109
result = "success";
110110
}
111111

@@ -115,7 +115,7 @@ void commondsCtrl(const HttpRequestPtr &req, std::function<void(const HttpRespon
115115
}
116116
break;
117117
case cat:
118-
result = shell_commons(("cat " + std::string(pathvar) + "/../root/" + params1).c_str());
118+
result = shell_commands(("cat " + std::string(pathvar) + "/../root/" + params1).c_str());
119119
break;
120120
default:
121121
result = "error:command not found";
@@ -131,7 +131,7 @@ void commondsCtrl(const HttpRequestPtr &req, std::function<void(const HttpRespon
131131
// {
132132
// char *pathvar;
133133
// pathvar = getenv("PWD");
134-
// std::string result = shell_commons(("cd " + std::string(pathvar) + "/.. " + "&&" + "tree -J root").c_str());
134+
// std::string result = shell_commands(("cd " + std::string(pathvar) + "/.. " + "&&" + "tree -J root").c_str());
135135
// auto res = HttpResponse::newHttpResponse();
136136
// res->addHeader("Access-Control-Allow-Origin", "*");
137137
// res->setBody(result);
@@ -142,7 +142,7 @@ void commondsCtrl(const HttpRequestPtr &req, std::function<void(const HttpRespon
142142
// char *pathvar;
143143
// pathvar = getenv("PWD");
144144
// std::string path = req->getParameter("path");
145-
// std::string result = shell_commons(("cat " + std::string(pathvar) + "/../root/" + path).c_str());
145+
// std::string result = shell_commands(("cat " + std::string(pathvar) + "/../root/" + path).c_str());
146146
// auto res = HttpResponse::newHttpResponse();
147147
// res->addHeader("Access-Control-Allow-Origin", "*");
148148
// res->setBody(result);
@@ -169,7 +169,7 @@ void saveFile(const HttpRequestPtr &req, std::function<void(const HttpResponsePt
169169
pathvar = getenv("PWD");
170170
std::string filename = req_json["filename"].asString();
171171
std::string content = req_json["content"].asString();
172-
std::string result = shell_commons(("echo '" + content + "'>" + std::string(pathvar) + "/../root/" + filename).c_str());
172+
std::string result = shell_commands(("echo '" + content + "'>" + std::string(pathvar) + "/../root/" + filename).c_str());
173173

174174
sql_unlocked(filename);
175175

@@ -205,7 +205,7 @@ void imageUpload(const HttpRequestPtr &req, std::function<void(const HttpRespons
205205
resp->addHeader("Access-Control-Allow-Origin", "*");
206206
resp->setBody(timestamp);
207207
file.save();
208-
shell_commons(("mv ./uploads/" + file.getFileName() + " ./uploads/" + timestamp).c_str());
208+
shell_commands(("mv ./uploads/" + file.getFileName() + " ./uploads/" + timestamp).c_str());
209209

210210
LOG_INFO << "The uploaded file has been saved to the ./uploads "
211211
"directory";

main.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ int main()
4242
{ getPicture(req, std::move(callback)); },
4343
{Get});
4444

45-
drogon::app().registerHandler("/api/file/commonds", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
46-
{ commondsCtrl(req, std::move(callback)); });
45+
drogon::app().registerHandler("/api/file/commands", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
46+
{ commandsCtrl(req, std::move(callback)); });
4747

4848
drogon::app().registerHandler("/api/file/lock", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
4949
{add_lock(req, std::move(callback));});

0 commit comments

Comments
 (0)