i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Match [Pp]assword:

Browse Source 
* Handle failing to remove the old image in case it's not there.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23510 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2008-01-14 02:04:42 +00:00
parent 82062f804c
commit f9f49bb963
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/codycam/SftpClient.cpp
+5 -3
View File
@@ -93,7 +93,7 @@ SftpClient::Connect(const string& server, const string& login, const string& pas
return false; return false;
} }
fprintf(stderr, "reply: '%s'\n", reply.String()); fprintf(stderr, "reply: '%s'\n", reply.String());
if (reply.FindFirst("password:") < 0) if (reply.FindFirst(/*[pP]*/"assword:") < 0)
return false; return false;
write(OutputPipe(), passwd.c_str(), strlen(passwd.c_str())); write(OutputPipe(), passwd.c_str(), strlen(passwd.c_str()));
@@ -170,6 +170,7 @@ SftpClient::MoveFile(const string& oldPath, const string& newPath)
// sftpd can't rename to an existing file... // sftpd can't rename to an existing file...
BString cmd("rm"); BString cmd("rm");
cmd << " " << newPath.c_str() << "\n"; cmd << " " << newPath.c_str() << "\n";
fprintf(stderr, "CMD: '%s'\n", cmd.String());
SendCommand(cmd.String()); SendCommand(cmd.String());
BString reply; BString reply;
@@ -178,8 +179,9 @@ SftpClient::MoveFile(const string& oldPath, const string& newPath)
return false; return false;
} }
fprintf(stderr, "reply: '%s'\n", reply.String()); fprintf(stderr, "reply: '%s'\n", reply.String());
if (reply.FindFirst("Removing") != 0) // we don't care if it worked or not.
return false; //if (reply.FindFirst("Removing") != 0 && reply.FindFirst("Couldn't") )
// return false;
if ((len = ReadReply(&reply)) < 0) { if ((len = ReadReply(&reply)) < 0) {
fprintf(stderr, "read: %d\n", len); fprintf(stderr, "read: %d\n", len);