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

* 7zip asks for a password on the stdout, we check for the "Enter password" string.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38878 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2010-10-03 21:02:47 +00:00
parent 37344020ef
commit 550bad1124
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/expander/ExpanderWindow.cpp
+17 -2
View File
@@ -335,6 +335,20 @@ ExpanderWindow::MessageReceived(BMessage* msg)
fListingText->Insert(string.String());
}
fListingText->ScrollToSelection();
} else if (fExpandingStarted) {
BString string;
int32 i = 0;
while (msg->FindString("output", i++, &string) == B_OK) {
if (strstr(string.String(), "Enter password") != NULL) {
fExpandingThread->SuspendExternalExpander();
BString password;
PasswordAlert* alert =
new PasswordAlert("passwordAlert", string);
alert->Go(password);
fExpandingThread->ResumeExternalExpander();
fExpandingThread->PushInput(password);
}
}
}
break;
@@ -346,7 +360,8 @@ ExpanderWindow::MessageReceived(BMessage* msg)
fExpandingThread->SuspendExternalExpander();
if (strstr(string.String(), "password") != NULL) {
BString password;
PasswordAlert* alert = new PasswordAlert("passwordAlert", string);
PasswordAlert* alert = new PasswordAlert("passwordAlert",
string);
alert->Go(password);
fExpandingThread->ResumeExternalExpander();
fExpandingThread->PushInput(password);
@@ -356,7 +371,7 @@ ExpanderWindow::MessageReceived(BMessage* msg)
B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
if (alert->Go() == 0) {
fExpandingThread->ResumeExternalExpander();
StopExpanding();
StopExpanding();
} else
fExpandingThread->ResumeExternalExpander();
}