Page MenuHome GnuPG
Files F26446248

No OneTemporary
Actions

View Options

This document is not UTF8. It was detected as Shift JIS and converted to UTF8 for display.
diff --git a/src/gnupgprocessbase.cpp b/src/gnupgprocessbase.cpp
index be67bab..ff704ff 100644
--- a/src/gnupgprocessbase.cpp
+++ b/src/gnupgprocessbase.cpp
@@ -1,152 +1,198 @@
/* -*- mode: C++; c-file-style: "gnu" -*-
gnupgprocessbase.cpp
This file is part of libkleopatra, the KDE keymanagement library
Copyright (c) 2004 Klar舁vdalens Datakonsult AB
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
Libkleopatra is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
the Qt library by Trolltech AS, Norway (or with modified versions
of Qt that use the same license as Qt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
Qt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
*/
#include "gnupgprocessbase.h"
#include <kdebug.h>
+#include <kurl.h>
#include <qsocketnotifier.h>
+#include <qtextcodec.h>
+#include <qstringlist.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <assert.h>
struct Kleo::GnuPGProcessBase::Private {
Private() : useStatusFD( false ), statnot( 0 ) {
statusFD[0] = statusFD[1] = -1;
}
bool useStatusFD;
int statusFD[2];
QSocketNotifier * statnot;
+ QCString statusBuffer;
};
Kleo::GnuPGProcessBase::GnuPGProcessBase( QObject * parent, const char * name )
: KProcess( parent, name )
{
d = new Private();
}
Kleo::GnuPGProcessBase::~GnuPGProcessBase() {
delete d; d = 0;
}
void Kleo::GnuPGProcessBase::setUseStatusFD( bool use ) {
assert( d );
d->useStatusFD = use;
}
bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) {
if ( d->useStatusFD ) {
// set up the status-fd. This should be in setupCommunication(),
// but then it's too late: we need the fd of the pipe to pass it
// as argument to the --status-fd option:
// PENDING(marc) find out why KProcess uses both pipe() and socketpair()...
if ( ::pipe( d->statusFD ) < 0 ) {
kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::start: pipe(2) failed: " << perror << endl;
return false;
}
::fcntl( d->statusFD[0], F_SETFD, FD_CLOEXEC );
::fcntl( d->statusFD[1], F_SETFD, FD_CLOEXEC );
if ( !arguments.empty() ) {
QValueList<QCString>::iterator it = arguments.begin();
++it;
arguments.insert( it, "--status-fd" );
char buf[25];
sprintf( buf, "%d", d->statusFD[1] );
arguments.insert( it, buf );
arguments.insert( it, "--no-tty" );
//arguments.insert( it, "--enable-progress-filter" ); // gpgsm doesn't know this
}
}
return KProcess::start( runmode, comm );
}
int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) {
if ( int ok = KProcess::setupCommunication( comm ) )
return ok;
if ( d->useStatusFD ) {
// base class impl returned error, so close our fd's, too
::close( d->statusFD[0] );
::close( d->statusFD[1] );
d->statusFD[0] = d->statusFD[1] = -1;
}
return 0; // Error
}
int Kleo::GnuPGProcessBase::commSetupDoneP() {
if ( d->useStatusFD ) {
::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader
d->statnot = new QSocketNotifier( d->statusFD[0], QSocketNotifier::Read, this );
connect( d->statnot, SIGNAL(activated(int)), SLOT(slotChildStatus(int)) );
}
return KProcess::commSetupDoneP();
}
int Kleo::GnuPGProcessBase::commSetupDoneC() {
if ( d->useStatusFD )
::fcntl( d->statusFD[1], F_SETFD, 0 );
return KProcess::commSetupDoneC();
}
void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) {
if ( !childStatus(fd) )
closeStatus();
}
bool Kleo::GnuPGProcessBase::closeStatus() {
if ( !d->useStatusFD )
return false;
d->useStatusFD = false;
delete d->statnot; d->statnot = 0;
::close( d->statusFD[0] ); d->statusFD[0] = -1;
return true;
}
int Kleo::GnuPGProcessBase::childStatus( int fd ) {
char buf[1024];
const int len = ::read( fd, buf, sizeof(buf)-1 );
if ( len > 0 ) {
- buf[len] = 0; // Just in case.
- emit receivedStatus( this, buf, len );
- // fixme: parse it
+ buf[len] = 0;
+ d->statusBuffer += buf;
+ parseStatusOutput();
}
return len;
}
+static QString fromHexEscapedUtf8( const QCString & str ) {
+ return KURL::decode_string( str.data(), 106 /* utf-8 */ );
+}
+
+void Kleo::GnuPGProcessBase::parseStatusOutput() {
+ static const char startToken[] = "[GNUPG:] ";
+ static const int startTokenLen = sizeof startToken / sizeof *startToken - 1;
+
+ int lineStart = 0;
+ for ( int lineEnd = d->statusBuffer.find( '\n' ) ; lineEnd >= 0 ; lineEnd = d->statusBuffer.find( '\n', lineStart = lineEnd+1 ) ) {
+ // get next line:
+ const QCString line = d->statusBuffer.mid( lineStart, lineEnd - lineStart ).stripWhiteSpace();
+ if ( line.isEmpty() )
+ continue;
+ // check status token
+ if ( line.left( startTokenLen ) != startToken ) {
+ kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childStatus: status-fd protocol error: line doesn't begin with \""
+ << startToken << "\"" << endl;
+ continue;
+ }
+ // remove status token:
+ const QCString command = line.mid( startTokenLen ).simplifyWhiteSpace() + ' ';
+ if ( command == " " ) {
+ kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childStatus: status-fd protocol error: line without content." << endl;
+ continue;
+ }
+ // split into base and args
+ QString cmd;
+ QStringList args;
+ int tagStart = 0;
+ for ( int tagEnd = command.find( ' ' ) ; tagEnd >= 0 ; tagEnd = command.find( ' ', tagStart = tagEnd+1 ) ) {
+ const QCString tag = command.mid( tagStart, tagEnd - tagStart );
+ if ( cmd.isNull() )
+ cmd = fromHexEscapedUtf8( tag );
+ else
+ args.push_back( fromHexEscapedUtf8( tag ) );
+ }
+ emit status( this, cmd, args );
+ }
+ d->statusBuffer = d->statusBuffer.mid( lineStart );
+}
+
void Kleo::GnuPGProcessBase::virtual_hook( int id, void * data ) {
KProcess::virtual_hook( id, data );
}
#include "gnupgprocessbase.moc"
diff --git a/src/gnupgprocessbase.h b/src/gnupgprocessbase.h
index ba579e1..94a5853 100644
--- a/src/gnupgprocessbase.h
+++ b/src/gnupgprocessbase.h
@@ -1,88 +1,91 @@
/* -*- mode: C++; c-file-style: "gnu" -*-
gnupgprocessbase.h
This file is part of libkleopatra, the KDE keymanagement library
Copyright (c) 2004 Klar舁vdalens Datakonsult AB
Libkleopatra is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
Libkleopatra is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
the Qt library by Trolltech AS, Norway (or with modified versions
of Qt that use the same license as Qt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
Qt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
*/
#ifndef __KLEO_GNUPGPROCESSBASE_H__
#define __KLEO_GNUPGPROCESSBASE_H__
#include <kprocess.h>
namespace Kleo {
/**
* @short a base class for GPG and GPGSM processes.
*
* This KProcess subclass implements the status-fd handling common
* to GPG and GPGSM.
*
* @author Marc Mutz <mutz@kde.org>
*/
class GnuPGProcessBase : public KProcess {
Q_OBJECT
public:
GnuPGProcessBase( QObject * parent=0, const char * name=0 );
~GnuPGProcessBase();
void setUseStatusFD( bool use );
/*! \reimp */
bool start( RunMode runmode, Communication comm );
bool closeStatus();
signals:
- void receivedStatus( Kleo::GnuPGProcessBase * proc, char * buffer, int buflen );
+ void status( Kleo::GnuPGProcessBase * proc, const QString & type, const QStringList & args );
protected:
/* !\reimp */
int setupCommunication( Communication comm );
/* !\reimp */
int commSetupDoneP();
/* !\reimp */
int commSetupDoneC();
int childStatus( int fd );
private slots:
void slotChildStatus( int fd );
+ private:
+ void parseStatusOutput();
+
private:
class Private;
Private * d;
protected:
/*! \reimp */
void virtual_hook( int id, void * data );
};
}
#endif // __KLEO_GNUPGPROCESSBASE_H__

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jul 17, 12:48 AM (1 d, 8 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
1a/9e/3f60015c96dcb579e85a72856448

Event Timeline