From 0f5809cb0849eaae724bf1c396cf82988fb8aaa4 Mon Sep 17 00:00:00 2001
From: Eduardo Machado <emm14@inf.ufpr.br>
Date: Thu, 3 Dec 2015 21:55:40 -0200
Subject: [PATCH] =?UTF-8?q?come=C3=A7ando=20a=20mexer=20no=20lsr2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main.cpp | 11 ++++++++++-
src/messages.cpp | 1 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/main.cpp b/src/main.cpp
index aaf0196..459b3ee 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -73,7 +73,7 @@ int main(int argc, char *argv[]) {
// }
if(serverReceive.getType() == 3){
if(serverReceive.checkParity()){ // Se a paridade estiver errada
- resposta.setData((unsigned char*)"0",0,0); // Manda um Nack
+ resposta.setData((unsigned char*)"3",0,0); // Manda um Nack
send(soquete,resposta.objToString(),68, 0);
} else {
mainMessage.receiveCD(serverReceive.getData());
@@ -83,6 +83,15 @@ int main(int argc, char *argv[]) {
currentPath = getcwd(buff, (size_t)size);
cout << currentPath << "(S) " << endl;
}
+ }else if(serverReceive.getType() == 4){
+ if(serverReceive.checkParity()){ // Se a paridade estiver errada
+ resposta.setData((unsigned char*)"4",0,0); // Manda um Nack
+ send(soquete,resposta.objToString(),68, 0);
+ } else {
+ if(mainMessage.receiveLS(resposta.getData(), currentPath)){
+ cout << "ERRO: ls remoto.";
+ }
+ }
}
}
}
diff --git a/src/messages.cpp b/src/messages.cpp
index 7c36266..68eae34 100644
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -578,6 +578,7 @@ int Message::receiveLS(unsigned char* options, char* currentPath){
lsFile.open(fileName.c_str(), ios::in);
lsFile.seekg (0);
// Leitura do arquivo.
+ show += path + "\n";
while(getline(lsFile, temp)) {
show += temp + "\n";
}
--
GitLab