|
|
|
@ -45,7 +45,7 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c
|
|
|
|
|
const TQString & keyFile, const TQString & options,
|
|
|
|
|
Operation mode,
|
|
|
|
|
TQObject * parent, const char * name )
|
|
|
|
|
: KProcess( parent, name ),
|
|
|
|
|
: TDEProcess( parent, name ),
|
|
|
|
|
mOperation( mode ), mOptions( options )
|
|
|
|
|
{
|
|
|
|
|
*this << "symcryptrun"
|
|
|
|
@ -58,10 +58,10 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c
|
|
|
|
|
Kleo::SymCryptRunProcessBase::~SymCryptRunProcessBase() {}
|
|
|
|
|
|
|
|
|
|
bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm ) {
|
|
|
|
|
connect( this, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
|
|
|
|
|
this, TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)) );
|
|
|
|
|
connect( this, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
|
|
|
|
|
this, TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)) );
|
|
|
|
|
connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
|
|
|
|
|
this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) );
|
|
|
|
|
connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
|
|
|
|
|
this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) );
|
|
|
|
|
if ( rm == Block ) {
|
|
|
|
|
KTempFile tempfile;
|
|
|
|
|
tempfile.setAutoDelete( true );
|
|
|
|
@ -72,15 +72,15 @@ bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm
|
|
|
|
|
tempfile.close();
|
|
|
|
|
*this << "--input" << tempfile.name();
|
|
|
|
|
addOptions();
|
|
|
|
|
return KProcess::start( Block, All );
|
|
|
|
|
return TDEProcess::start( Block, All );
|
|
|
|
|
} else {
|
|
|
|
|
addOptions();
|
|
|
|
|
const bool ok = KProcess::start( rm, All );
|
|
|
|
|
const bool ok = TDEProcess::start( rm, All );
|
|
|
|
|
if ( !ok )
|
|
|
|
|
return ok;
|
|
|
|
|
mInput = input.copy();
|
|
|
|
|
writeStdin( mInput.begin(), mInput.size() );
|
|
|
|
|
connect( this, TQT_SIGNAL(wroteStdin(KProcess*)), this, TQT_SLOT(closeStdin()) );
|
|
|
|
|
connect( this, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(closeStdin()) );
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -93,14 +93,14 @@ void Kleo::SymCryptRunProcessBase::addOptions() {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Kleo::SymCryptRunProcessBase::slotReceivedStdout( KProcess * proc, char * buf, int len ) {
|
|
|
|
|
void Kleo::SymCryptRunProcessBase::slotReceivedStdout( TDEProcess * proc, char * buf, int len ) {
|
|
|
|
|
Q_ASSERT( proc == this );
|
|
|
|
|
const int oldsize = mOutput.size();
|
|
|
|
|
mOutput.resize( oldsize + len );
|
|
|
|
|
memcpy( mOutput.data() + oldsize, buf, len );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Kleo::SymCryptRunProcessBase::slotReceivedStderr( KProcess * proc, char * buf, int len ) {
|
|
|
|
|
void Kleo::SymCryptRunProcessBase::slotReceivedStderr( TDEProcess * proc, char * buf, int len ) {
|
|
|
|
|
Q_ASSERT( proc == this );
|
|
|
|
|
if ( len > 0 )
|
|
|
|
|
mStderr += TQString::fromLocal8Bit( buf, len );
|
|
|
|
|