summaryrefslogtreecommitdiff
authorsandman <sandman>2002-12-17 19:16:18 (UTC)
committer sandman <sandman>2002-12-17 19:16:18 (UTC)
commitf36c70938c8c2907a1b61637af3bd589262b4b5e (patch) (side-by-side diff)
tree7ed7429477ad0b17ea131fddcc5cab9fff088b26
parentb6a03145553d7f536b04fc3355718cfdd72c590d (diff)
downloadopie-f36c70938c8c2907a1b61637af3bd589262b4b5e.zip
opie-f36c70938c8c2907a1b61637af3bd589262b4b5e.tar.gz
opie-f36c70938c8c2907a1b61637af3bd589262b4b5e.tar.bz2
replaced the private QProcess copy for the FTP server with the already
available libopie/OProcess
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/launcher.pro2
-rw-r--r--core/launcher/qprocess.cpp654
-rw-r--r--core/launcher/qprocess.h174
-rw-r--r--core/launcher/qprocess_unix.cpp1158
-rw-r--r--core/launcher/transferserver.cpp191
-rw-r--r--core/launcher/transferserver.h14
6 files changed, 120 insertions, 2073 deletions
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 3391378..21f8374 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -3,9 +3,8 @@ CONFIG = qt warn_on release
DESTDIR = ../../bin
HEADERS = background.h \
desktop.h \
screensaver.h \
- qprocess.h \
mediummountgui.h \
info.h \
appicons.h \
taskbar.h \
@@ -46,9 +45,8 @@ HEADERS = background.h \
SOURCES = background.cpp \
desktop.cpp \
screensaver.cpp \
mediummountgui.cpp \
- qprocess.cpp qprocess_unix.cpp \
info.cpp \
appicons.cpp \
taskbar.cpp \
sidething.cpp \
diff --git a/core/launcher/qprocess.cpp b/core/launcher/qprocess.cpp
deleted file mode 100644
index 618c0e0..0000000
--- a/core/launcher/qprocess.cpp
+++ b/dev/null
@@ -1,654 +0,0 @@
-/****************************************************************************
-** $Id$
-**
-** Implementation of QProcess class
-**
-** Created : 20000905
-**
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
-**
-** This file is part of the kernel module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "qprocess.h"
-
-#ifndef QT_NO_PROCESS
-
-#include "qapplication.h"
-
-
-//#define QT_QPROCESS_DEBUG
-
-
-/*!
- \class QProcess qprocess.h
-
- \brief The QProcess class is used to start external programs and to
- communicate with them.
-
- This is a temporary class. This will be replaced by Qt 3's QProcess class.
-*/
-
-/*!
- \enum QProcess::Communication
-
- This enum type defines the communication channels connected to the
- process.
-
- \value Stdin Data can be written to the process's standard input.
-
- \value Stdout Data can be read from the process's standard output.
-
- \value Stderr Data can be read from the process's standard error.
-
- \value DupStderr Duplicates standard error to standard output for new
- processes; i.e. everything that the process writes to standard error, is
- reported by QProcess on standard output instead. This is especially useful if
- your application requires that the output on standard output and standard
- error is read in the same order as the process output it. Please note that
- this is a binary flag, so if you want to activate this together with standard
- input, output and error redirection (the default), you have to specify
- \c{Stdin|Stdout|Stderr|DupStderr} for the setCommunication() call.
-
- \sa setCommunication() communication()
-*/
-
-/*!
- Constructs a QProcess object. The \a parent and \a name parameters are passed
- to the QObject constructor.
-
- \sa setArguments() addArgument() start()
-*/
-QProcess::QProcess( QObject *parent, const char *name )
- : QObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ),
- wroteToStdinConnected( FALSE ),
- readStdoutCalled( FALSE ), readStderrCalled( FALSE ),
- comms( Stdin|Stdout|Stderr )
-{
- init();
-}
-
-/*!
- Constructs a QProcess with \a arg0 as the command to be executed. The
- \a parent and \a name parameters are passed to the QObject constructor.
-
- The process is not started. You must call start() or launch()
- to start the process.
-
- \sa setArguments() addArgument() start()
-*/
-QProcess::QProcess( const QString& arg0, QObject *parent, const char *name )
- : QObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ),
- wroteToStdinConnected( FALSE ),
- readStdoutCalled( FALSE ), readStderrCalled( FALSE ),
- comms( Stdin|Stdout|Stderr )
-{
- init();
- addArgument( arg0 );
-}
-
-/*!
- Constructs a QProcess with \a args as the arguments of the process. The first
- element in the list is the command to be executed. The other elements in the
- list are the arguments to this command. The \a parent and \a name
- parameters are passed to the QObject constructor.
-
- The process is not started. You must call start() or launch()
- to start the process.
-
- \sa setArguments() addArgument() start()
-*/
-QProcess::QProcess( const QStringList& args, QObject *parent, const char *name )
- : QObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ),
- wroteToStdinConnected( FALSE ),
- readStdoutCalled( FALSE ), readStderrCalled( FALSE ),
- comms( Stdin|Stdout|Stderr )
-{
- init();
- setArguments( args );
-}
-
-
-/*!
- Returns the list of arguments that are set for the process. Arguments can be
- specified with the constructor or with the functions setArguments() and
- addArgument().
-
- \sa setArguments() addArgument()
-*/
-QStringList QProcess::arguments() const
-{
- return _arguments;
-}
-
-/*!
- Clears the list of arguments that are set for the process.
-
- \sa setArguments() addArgument()
-*/
-void QProcess::clearArguments()
-{
- _arguments.clear();
-}
-
-/*!
- Sets \a args as the arguments for the process. The first element in the list
- is the command to be executed. The other elements in the list are the
- arguments to the command. Any previous arguments are deleted.
-
- \sa arguments() addArgument()
-*/
-void QProcess::setArguments( const QStringList& args )
-{
- _arguments = args;
-}
-
-/*!
- Adds \a arg to the end of the list of arguments.
-
- The first element in the list of arguments is the command to be
- executed; the following elements are the arguments to the command.
-
- \sa arguments() setArguments()
-*/
-void QProcess::addArgument( const QString& arg )
-{
- _arguments.append( arg );
-}
-
-#ifndef QT_NO_DIR
-/*!
- Returns the working directory that was set with
- setWorkingDirectory(), or the current directory if none has been
- set.
-
- \sa setWorkingDirectory() QDir::current()
-*/
-QDir QProcess::workingDirectory() const
-{
- return workingDir;
-}
-
-/*!
- Sets \a dir as the working directory for a process. This does not affect
- running processes; only processes that are started afterwards are affected.
-
- Setting the working directory is especially useful for processes that try to
- access files with relative filenames.
-
- \sa workingDirectory() start()
-*/
-void QProcess::setWorkingDirectory( const QDir& dir )
-{
- workingDir = dir;
-}
-#endif //QT_NO_DIR
-
-/*!
- Returns the communication required with the process.
-
- \sa setCommunication()
-*/
-int QProcess::communication() const
-{
- return comms;
-}
-
-/*!
- Sets \a commFlags as the communication required with the process.
-
- \a commFlags is a bitwise OR between the flags defined in \c Communication.
-
- The default is \c{Stdin|Stdout|Stderr}.
-
- \sa communication()
-*/
-void QProcess::setCommunication( int commFlags )
-{
- comms = commFlags;
-}
-
-/*!
- Returns TRUE if the process has exited normally; otherwise returns
- FALSE. This implies that this function returns FALSE if the process
- is still running.
-
- \sa isRunning() exitStatus() processExited()
-*/
-bool QProcess::normalExit() const
-{
- // isRunning() has the side effect that it determines the exit status!
- if ( isRunning() )
- return FALSE;
- else
- return exitNormal;
-}
-
-/*!
- Returns the exit status of the process or 0 if the process is still
- running. This function returns immediately and does not wait until
- the process is finished.
-
- If normalExit() is FALSE (e.g. if the program was killed or
- crashed), this function returns 0, so you should check the return
- value of normalExit() before relying on this value.
-
- \sa normalExit() processExited()
-*/
-int QProcess::exitStatus() const
-{
- // isRunning() has the side effect that it determines the exit status!
- if ( isRunning() )
- return 0;
- else
- return exitStat;
-}
-
-
-/*!
- Reads the data that the process has written to standard output. When
- new data is written to standard output, the class emits the signal
- readyReadStdout().
-
- If there is no data to read, this function returns a QByteArray of
- size 0: it does not wait until there is something to read.
-
- \sa readyReadStdout() readLineStdout() readStderr() writeToStdin()
-*/
-QByteArray QProcess::readStdout()
-{
- if ( readStdoutCalled ) {
- return QByteArray();
- }
- readStdoutCalled = TRUE;
-
- QByteArray buf = bufStdout()->copy();
- consumeBufStdout( -1 ); // consume everything
-
- readStdoutCalled = FALSE;
- return buf;
-}
-
-/*!
- Reads the data that the process has written to standard error. When
- new data is written to standard error, the class emits the signal
- readyReadStderr().
-
- If there is no data to read, this function returns a QByteArray of
- size 0: it does not wait until there is something to read.
-
- \sa readyReadStderr() readLineStderr() readStdout() writeToStdin()
-*/
-QByteArray QProcess::readStderr()
-{
- if ( readStderrCalled ) {
- return QByteArray();
- }
- readStderrCalled = TRUE;
-
- QByteArray buf = bufStderr()->copy();
- consumeBufStderr( -1 ); // consume everything
-
- readStderrCalled = FALSE;
- return buf;
-}
-
-/*!
- Returns TRUE if it's possible to read an entire line of text from
- standard output at this time; otherwise returns FALSE.
-
- \sa readLineStdout() canReadLineStderr()
-*/
-bool QProcess::canReadLineStdout() const
-{
- QProcess *that = (QProcess*)this;
- return that->scanNewline( TRUE, 0 );
-}
-
-/*!
- Returns TRUE if it's possible to read an entire line of text from
- standard error at this time; otherwise returns FALSE.
-
- \sa readLineStderr() canReadLineStdout()
-*/
-bool QProcess::canReadLineStderr() const
-{
- QProcess *that = (QProcess*)this;
- return that->scanNewline( FALSE, 0 );
-}
-
-/*!
- Reads a line of text from standard output, excluding any trailing newline or
- carriage return characters, and returns it. Returns QString::null if
- canReadLineStdout() returns FALSE.
-
- \sa canReadLineStdout() readyReadStdout() readStdout() readLineStderr()
-*/
-QString QProcess::readLineStdout()
-{
- QByteArray a;
- QString s;
- if ( scanNewline( TRUE, &a ) ) {
- if ( a.isEmpty() )
- s = "";
- else
- s = QString( a );
- }
- return s;
-}
-
-/*!
- Reads a line of text from standard error, excluding any trailing newline or
- carriage return characters and returns it. Returns QString::null if
- canReadLineStderr() returns FALSE.
-
- \sa canReadLineStderr() readyReadStderr() readStderr() readLineStdout()
-*/
-QString QProcess::readLineStderr()
-{
- QByteArray a;
- QString s;
- if ( scanNewline( FALSE, &a ) ) {
- if ( a.isEmpty() )
- s = "";
- else
- s = QString( a );
- }
- return s;
-}
-
-/*!
- This private function scans for any occurrence of \n or \r\n in the
- buffer \e buf. It stores the text in the byte array \a store if it is
- non-null.
-*/
-bool QProcess::scanNewline( bool stdOut, QByteArray *store )
-{
- QByteArray *buf;
- if ( stdOut )
- buf = bufStdout();
- else
- buf = bufStderr();
- uint n = buf->size();
- uint i;
- for ( i=0; i<n; i++ ) {
- if ( buf->at(i) == '\n' ) {
- break;
- }
- }
- if ( i >= n )
- return FALSE;
-
- if ( store ) {
- uint lineLength = i;
- if ( lineLength>0 && buf->at(lineLength-1) == '\r' )
- lineLength--; // (if there are two \r, let one stay)
- store->resize( lineLength );
- memcpy( store->data(), buf->data(), lineLength );
- if ( stdOut )
- consumeBufStdout( i+1 );
- else
- consumeBufStderr( i+1 );
- }
- return TRUE;
-}
-
-/*!
- \fn void QProcess::launchFinished()
-
- This signal is emitted when the process was started with launch().
- If the start was successful, this signal is emitted after all the
- data has been written to standard input. If the start failed, then
- this signal is emitted immediately.
-
- \sa launch() QObject::deleteLater()
-*/
-
-/*!
- Runs the process and writes the data \a buf to the process's standard input.
- If all the data is written to standard input, standard input is
- closed. The command is searched for in the path for executable programs;
- you can also use an absolute path in the command itself.
-
- If \a env is null, then the process is started with the same environment as
- the starting process. If \a env is non-null, then the values in the
- stringlist are interpreted as environment setttings of the form \c
- {key=value} and the process is started with these environment settings. For
- convenience, there is a small exception to this rule under Unix: if \a env
- does not contain any settings for the environment variable \c
- LD_LIBRARY_PATH, then this variable is inherited from the starting process.
-
- Returns TRUE if the process could be started; otherwise returns FALSE.
-
- Note that you should not use the slots writeToStdin() and closeStdin() on
- processes started with launch(), since the result is not well-defined. If you
- need these slots, use start() instead.
-
- The process may or may not read the \a buf data sent to its standard
- input.
-
- You can call this function even when a process that was started with
- this instance is still running. Be aware that if you do this the
- standard input of the process that was launched first will be
- closed, with any pending data being deleted, and the process will be
- left to run out of your control. Similarly, if the process could not
- be started the standard input will be closed and the pending data
- deleted. (On operating systems that have zombie processes, Qt will
- also wait() on the old process.)
-
- The object emits the signal launchFinished() when this function
- call is finished. If the start was successful, this signal is
- emitted after all the data has been written to standard input. If
- the start failed, then this signal is emitted immediately.
-
- \sa start() launchFinished();
-*/
-bool QProcess::launch( const QByteArray& buf, QStringList *env )
-{
- if ( start( env ) ) {
- if ( !buf.isEmpty() ) {
- connect( this, SIGNAL(wroteToStdin()),
- this, SLOT(closeStdinLaunch()) );
- writeToStdin( buf );
- } else {
- closeStdin();
- emit launchFinished();
- }
- return TRUE;
- } else {
- emit launchFinished();
- return FALSE;
- }
-}
-
-/*! \overload
-
- The data \a buf is written to standard input with writeToStdin()
- using the QString::local8Bit() representation of the strings.
-*/
-bool QProcess::launch( const QString& buf, QStringList *env )
-{
- if ( start( env ) ) {
- if ( !buf.isEmpty() ) {
- connect( this, SIGNAL(wroteToStdin()),
- this, SLOT(closeStdinLaunch()) );
- writeToStdin( buf );
- } else {
- closeStdin();
- emit launchFinished();
- }
- return TRUE;
- } else {
- emit launchFinished();
- return FALSE;
- }
-}
-
-/*!
- This private slot is used by the launch() functions to close standard input.
-*/
-void QProcess::closeStdinLaunch()
-{
- disconnect( this, SIGNAL(wroteToStdin()),
- this, SLOT(closeStdinLaunch()) );
- closeStdin();
- emit launchFinished();
-}
-
-
-/*!
- \fn void QProcess::readyReadStdout()
-
- This signal is emitted when the process has written data to standard output.
- You can read the data with readStdout().
-
- Note that this signal is only emitted when there is new data and not
- when there is old, but unread data. In the slot connected to this signal, you
- should always read everything that is available at that moment to make sure
- that you don't lose any data.
-
- \sa readStdout() readLineStdout() readyReadStderr()
-*/
-/*!
- \fn void QProcess::readyReadStderr()
-
- This signal is emitted when the process has written data to standard error.
- You can read the data with readStderr().
-
- Note that this signal is only emitted when there is new data and not
- when there is old, but unread data. In the slot connected to this signal, you
- should always read everything that is available at that moment to make sure
- that you don't lose any data.
-
- \sa readStderr() readLineStderr() readyReadStdout()
-*/
-/*!
- \fn void QProcess::processExited()
-
- This signal is emitted when the process has exited.
-
- \sa isRunning() normalExit() exitStatus() start() launch()
-*/
-/*!
- \fn void QProcess::wroteToStdin()
-
- This signal is emitted if the data sent to standard input (via
- writeToStdin()) was actually written to the process. This does not
- imply that the process really read the data, since this class only detects
- when it was able to write the data to the operating system. But it is now
- safe to close standard input without losing pending data.
-
- \sa writeToStdin() closeStdin()
-*/
-
-
-/*! \overload
-
- The string \a buf is handled as text using
- the QString::local8Bit() representation.
-*/
-void QProcess::writeToStdin( const QString& buf )
-{
- QByteArray tmp = buf.local8Bit();
- tmp.resize( buf.length() );
- writeToStdin( tmp );
-}
-
-
-/*
- * Under Windows the implementation is not so nice: it is not that easy to
- * detect when one of the signals should be emitted; therefore there are some
- * timers that query the information.
- * To keep it a little efficient, use the timers only when they are needed.
- * They are needed, if you are interested in the signals. So use
- * connectNotify() and disconnectNotify() to keep track of your interest.
- */
-/*! \reimp
-*/
-void QProcess::connectNotify( const char * signal )
-{
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::connectNotify(): signal %s has been connected", signal );
-#endif
- if ( !ioRedirection )
- if ( qstrcmp( signal, SIGNAL(readyReadStdout()) )==0 ||
- qstrcmp( signal, SIGNAL(readyReadStderr()) )==0
- ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::connectNotify(): set ioRedirection to TRUE" );
-#endif
- setIoRedirection( TRUE );
- return;
- }
- if ( !notifyOnExit && qstrcmp( signal, SIGNAL(processExited()) )==0 ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::connectNotify(): set notifyOnExit to TRUE" );
-#endif
- setNotifyOnExit( TRUE );
- return;
- }
- if ( !wroteToStdinConnected && qstrcmp( signal, SIGNAL(wroteToStdin()) )==0 ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::connectNotify(): set wroteToStdinConnected to TRUE" );
-#endif
- setWroteStdinConnected( TRUE );
- return;
- }
-}
-
-/*! \reimp
-*/
-void QProcess::disconnectNotify( const char * )
-{
- if ( ioRedirection &&
- receivers( SIGNAL(readyReadStdout()) ) ==0 &&
- receivers( SIGNAL(readyReadStderr()) ) ==0
- ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::disconnectNotify(): set ioRedirection to FALSE" );
-#endif
- setIoRedirection( FALSE );
- }
- if ( notifyOnExit && receivers( SIGNAL(processExited()) ) == 0 ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::disconnectNotify(): set notifyOnExit to FALSE" );
-#endif
- setNotifyOnExit( FALSE );
- }
- if ( wroteToStdinConnected && receivers( SIGNAL(wroteToStdin()) ) == 0 ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::disconnectNotify(): set wroteToStdinConnected to FALSE" );
-#endif
- setWroteStdinConnected( FALSE );
- }
-}
-
-#endif // QT_NO_PROCESS
diff --git a/core/launcher/qprocess.h b/core/launcher/qprocess.h
deleted file mode 100644
index 306e659..0000000
--- a/core/launcher/qprocess.h
+++ b/dev/null
@@ -1,174 +0,0 @@
-/****************************************************************************
-** $Id$
-**
-** Implementation of QProcess class
-**
-** Created : 20000905
-**
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
-**
-** This file is part of the kernel module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#ifndef QPROCESS_H
-#define QPROCESS_H
-
-#ifndef QT_H
-#include "qobject.h"
-#include "qstringlist.h"
-#include "qdir.h"
-#endif // QT_H
-
-#ifndef QT_NO_PROCESS
-
-class QProcessPrivate;
-
-
-class Q_EXPORT QProcess : public QObject
-{
- Q_OBJECT
-public:
- QProcess( QObject *parent=0, const char *name=0 );
- QProcess( const QString& arg0, QObject *parent=0, const char *name=0 );
- QProcess( const QStringList& args, QObject *parent=0, const char *name=0 );
- ~QProcess();
-
- // set and get the arguments and working directory
- QStringList arguments() const;
- void clearArguments();
- virtual void setArguments( const QStringList& args );
- virtual void addArgument( const QString& arg );
-#ifndef QT_NO_DIR
- QDir workingDirectory() const;
- virtual void setWorkingDirectory( const QDir& dir );
-#endif
-
- // set and get the comms wanted
- enum Communication { Stdin=0x01, Stdout=0x02, Stderr=0x04, DupStderr=0x08 };
- void setCommunication( int c );
- int communication() const;
-
- // start the execution
- virtual bool start( QStringList *env=0 );
- virtual bool launch( const QString& buf, QStringList *env=0 );
- virtual bool launch( const QByteArray& buf, QStringList *env=0 );
-
- // inquire the status
- bool isRunning() const;
- bool normalExit() const;
- int exitStatus() const;
-
- // reading
- virtual QByteArray readStdout();
- virtual QByteArray readStderr();
- bool canReadLineStdout() const;
- bool canReadLineStderr() const;
- virtual QString readLineStdout();
- virtual QString readLineStderr();
-
- // get platform dependent process information
-#if defined(Q_OS_WIN32)
- typedef void* PID;
-#else
- typedef long Q_LONG;
- typedef Q_LONG PID;
-#endif
- PID processIdentifier();
-
- void flushStdin();
-
-signals:
- void readyReadStdout();
- void readyReadStderr();
- void processExited();
- void wroteToStdin();
- void launchFinished();
-
-public slots:
- // end the execution
- void tryTerminate() const;
- void kill() const;
-
- // input
- virtual void writeToStdin( const QByteArray& buf );
- virtual void writeToStdin( const QString& buf );
- virtual void closeStdin();
-
-protected: // ### or private?
- void connectNotify( const char * signal );
- void disconnectNotify( const char * signal );
-private:
- void setIoRedirection( bool value );
- void setNotifyOnExit( bool value );
- void setWroteStdinConnected( bool value );
-
- void init();
- void reset();
-#if defined(Q_OS_WIN32)
- uint readStddev( HANDLE dev, char *buf, uint bytes );
-#endif
- bool scanNewline( bool stdOut, QByteArray *store );
-
- QByteArray* bufStdout();
- QByteArray* bufStderr();
- void consumeBufStdout( int consume );
- void consumeBufStderr( int consume );
-
-private slots:
- void socketRead( int fd );
- void socketWrite( int fd );
- void timeout();
- void closeStdinLaunch();
-
-private:
- QProcessPrivate *d;
-#ifndef QT_NO_DIR
- QDir workingDir;
-#endif
- QStringList _arguments;
-
- int exitStat; // exit status
- bool exitNormal; // normal exit?
- bool ioRedirection; // automatically set be (dis)connectNotify
- bool notifyOnExit; // automatically set be (dis)connectNotify
- bool wroteToStdinConnected; // automatically set be (dis)connectNotify
-
- bool readStdoutCalled;
- bool readStderrCalled;
- int comms;
-
- friend class QProcessPrivate;
-#if defined(Q_OS_UNIX) || defined(_OS_UNIX) || defined(UNIX)
- friend class QProcessManager;
- friend class QProc;
-#endif
-};
-
-#endif // QT_NO_PROCESS
-
-#endif // QPROCESS_H
diff --git a/core/launcher/qprocess_unix.cpp b/core/launcher/qprocess_unix.cpp
deleted file mode 100644
index 75f0f0c..0000000
--- a/core/launcher/qprocess_unix.cpp
+++ b/dev/null
@@ -1,1158 +0,0 @@
-/****************************************************************************
-** $Id$
-**
-** Implementation of QProcess class for Unix
-**
-** Created : 20000905
-**
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
-**
-** This file is part of the kernel module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-//#include "qplatformdefs.h"
-
-// Solaris redefines connect -> __xnet_connect with _XOPEN_SOURCE_EXTENDED.
-#if defined(connect)
-#undef connect
-#endif
-
-#include "qprocess.h"
-
-#ifndef QT_NO_PROCESS
-
-#include "qapplication.h"
-#include "qqueue.h"
-#include "qlist.h"
-#include "qsocketnotifier.h"
-#include "qtimer.h"
-#include "qregexp.h"
-
-#include "qcleanuphandler_p.h"
-
-#include <stdlib.h>
-
-// ### FOR Qt 2.3 compat
-#include <unistd.h>
-#include <signal.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/wait.h>
-#include <sys/fcntl.h>
-
-#include <errno.h>
-
-#ifdef __MIPSEL__
-# ifndef SOCK_DGRAM
-# define SOCK_DGRAM 1
-# endif
-# ifndef SOCK_STREAM
-# define SOCK_STREAM 2
-# endif
-#endif
-
-//#define QT_QPROCESS_DEBUG
-
-
-#ifdef Q_C_CALLBACKS
-extern "C" {
-#endif // Q_C_CALLBACKS
-
-#define QT_SIGNAL_RETTYPE void
-#define QT_SIGNAL_ARGS int
-#define QT_SIGNAL_IGNORE SIG_IGN
-
- QT_SIGNAL_RETTYPE qt_C_sigchldHnd(QT_SIGNAL_ARGS);
-
-#ifdef Q_C_CALLBACKS
-}
-#endif // Q_C_CALLBACKS
-
-
-class QProc;
-class QProcessManager;
-class QProcessPrivate
-{
-public:
- QProcessPrivate();
- ~QProcessPrivate();
-
- void closeOpenSocketsForChild();
- void newProc( pid_t pid, QProcess *process );
-
- QByteArray bufStdout;
- QByteArray bufStderr;
-
- QQueue<QByteArray> stdinBuf;
-
- QSocketNotifier *notifierStdin;
- QSocketNotifier *notifierStdout;
- QSocketNotifier *notifierStderr;
-
- ssize_t stdinBufRead;
- QProc *proc;
-
- bool exitValuesCalculated;
- bool socketReadCalled;
-
- static QProcessManager *procManager;
-};
-
-
-/***********************************************************************
- *
- * QProc
- *
- **********************************************************************/
-/*
- The class QProcess does not necessarily map exactly to the running
- child processes: if the process is finished, the QProcess class may still be
- there; furthermore a user can use QProcess to start more than one process.
-
- The helper-class QProc has the semantics that one instance of this class maps
- directly to a running child process.
-*/
-class QProc
-{
-public:
- QProc( pid_t p, QProcess *proc=0 ) : pid(p), process(proc)
- {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProc: Constructor for pid %d and QProcess %p", pid, process );
-#endif
- socketStdin = 0;
- socketStdout = 0;
- socketStderr = 0;
- }
- ~QProc()
- {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProc: Destructor for pid %d and QProcess %p", pid, process );
-#endif
- if ( process != 0 ) {
- if ( process->d->notifierStdin )
- process->d->notifierStdin->setEnabled( FALSE );
- if ( process->d->notifierStdout )
- process->d->notifierStdout->setEnabled( FALSE );
- if ( process->d->notifierStderr )
- process->d->notifierStderr->setEnabled( FALSE );
- process->d->proc = 0;
- }
- if( socketStdin != 0 )
- ::close( socketStdin );
- // ### close these sockets even on parent exit or is it better only on
- // sigchld (but what do I have to do with them on exit then)?
- if( socketStdout != 0 )
- ::close( socketStdout );
- if( socketStderr != 0 )
- ::close( socketStderr );
- }
-
- pid_t pid;
- int socketStdin;
- int socketStdout;
- int socketStderr;
- QProcess *process;
-};
-
-/***********************************************************************
- *
- * QProcessManager
- *
- **********************************************************************/
-class QProcessManager : public QObject
-{
- Q_OBJECT
-
-public:
- QProcessManager();
- ~QProcessManager();
-
- void append( QProc *p );
- void remove( QProc *p );
-
- void cleanup();
-
-public slots:
- void removeMe();
- void sigchldHnd( int );
-
-public:
- struct sigaction oldactChld;
- struct sigaction oldactPipe;
- QList<QProc> *procList;
- int sigchldFd[2];
-};
-
-QCleanupHandler<QProcessManager> qprocess_cleanup_procmanager;
-
-QProcessManager::QProcessManager()
-{
- procList = new QList<QProc>;
- procList->setAutoDelete( TRUE );
-
- // The SIGCHLD handler writes to a socket to tell the manager that
- // something happened. This is done to get the processing in sync with the
- // event reporting.
- if ( ::socketpair( AF_UNIX, SOCK_STREAM, 0, sigchldFd ) ) {
- sigchldFd[0] = 0;
- sigchldFd[1] = 0;
- } else {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager: install socket notifier (%d)", sigchldFd[1] );
-#endif
- QSocketNotifier *sn = new QSocketNotifier( sigchldFd[1],
- QSocketNotifier::Read, this );
- connect( sn, SIGNAL(activated(int)),
- this, SLOT(sigchldHnd(int)) );
- sn->setEnabled( TRUE );
- }
-
- // install a SIGCHLD handler and ignore SIGPIPE
- struct sigaction act;
-
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager: install a SIGCHLD handler" );
-#endif
- act.sa_handler = qt_C_sigchldHnd;
- sigemptyset( &(act.sa_mask) );
- sigaddset( &(act.sa_mask), SIGCHLD );
- act.sa_flags = SA_NOCLDSTOP;
-#if defined(SA_RESTART)
- act.sa_flags |= SA_RESTART;
-#endif
- if ( sigaction( SIGCHLD, &act, &oldactChld ) != 0 )
- qWarning( "Error installing SIGCHLD handler" );
-
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager: install a SIGPIPE handler (SIG_IGN)" );
-#endif
- act.sa_handler = QT_SIGNAL_IGNORE;
- sigemptyset( &(act.sa_mask) );
- sigaddset( &(act.sa_mask), SIGPIPE );
- act.sa_flags = 0;
- if ( sigaction( SIGPIPE, &act, &oldactPipe ) != 0 )
- qWarning( "Error installing SIGPIPE handler" );
-}
-
-QProcessManager::~QProcessManager()
-{
- delete procList;
-
- if ( sigchldFd[0] != 0 )
- ::close( sigchldFd[0] );
- if ( sigchldFd[1] != 0 )
- ::close( sigchldFd[1] );
-
- // restore SIGCHLD handler
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager: restore old sigchild handler" );
-#endif
- if ( sigaction( SIGCHLD, &oldactChld, 0 ) != 0 )
- qWarning( "Error restoring SIGCHLD handler" );
-
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager: restore old sigpipe handler" );
-#endif
- if ( sigaction( SIGPIPE, &oldactPipe, 0 ) != 0 )
- qWarning( "Error restoring SIGPIPE handler" );
-}
-
-void QProcessManager::append( QProc *p )
-{
- procList->append( p );
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager: append process (procList.count(): %d)", procList->count() );
-#endif
-}
-
-void QProcessManager::remove( QProc *p )
-{
- procList->remove( p );
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager: remove process (procList.count(): %d)", procList->count() );
-#endif
- cleanup();
-}
-
-void QProcessManager::cleanup()
-{
- if ( procList->count() == 0 ) {
- QTimer::singleShot( 0, this, SLOT(removeMe()) );
- }
-}
-
-void QProcessManager::removeMe()
-{
- if ( procList->count() == 0 ) {
- qprocess_cleanup_procmanager.remove( &QProcessPrivate::procManager );
- QProcessPrivate::procManager = 0;
- delete this;
- }
-}
-
-void QProcessManager::sigchldHnd( int fd )
-{
- char tmp;
- ::read( fd, &tmp, sizeof(tmp) );
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager::sigchldHnd()" );
-#endif
- QProc *proc;
- QProcess *process;
- bool removeProc;
- proc = procList->first();
- while ( proc != 0 ) {
- removeProc = FALSE;
- process = proc->process;
- if ( process != 0 ) {
- if ( !process->isRunning() ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager::sigchldHnd() (PID: %d): process exited (QProcess available)", proc->pid );
-#endif
- // read pending data
- int nbytes = 0;
- if ( ::ioctl(proc->socketStdout, FIONREAD, (char*)&nbytes)==0 && nbytes>0 ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stdout", proc->pid, nbytes );
-#endif
- process->socketRead( proc->socketStdout );
- }
- nbytes = 0;
- if ( ::ioctl(proc->socketStderr, FIONREAD, (char*)&nbytes)==0 && nbytes>0 ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stderr", proc->pid, nbytes );
-#endif
- process->socketRead( proc->socketStderr );
- }
-
- if ( process->notifyOnExit )
- emit process->processExited();
-
- removeProc = TRUE;
- }
- } else {
- int status;
- if ( ::waitpid( proc->pid, &status, WNOHANG ) == proc->pid ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessManager::sigchldHnd() (PID: %d): process exited (QProcess not available)", proc->pid );
-#endif
- removeProc = TRUE;
- }
- }
- if ( removeProc ) {
- QProc *oldproc = proc;
- proc = procList->next();
- remove( oldproc );
- } else {
- proc = procList->next();
- }
- }
-}
-
-#include "qprocess_unix.moc"
-
-
-/***********************************************************************
- *
- * QProcessPrivate
- *
- **********************************************************************/
-QProcessManager *QProcessPrivate::procManager = 0;
-
-QProcessPrivate::QProcessPrivate()
-{
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessPrivate: Constructor" );
-#endif
- stdinBufRead = 0;
-
- notifierStdin = 0;
- notifierStdout = 0;
- notifierStderr = 0;
-
- exitValuesCalculated = FALSE;
- socketReadCalled = FALSE;
-
- proc = 0;
-}
-
-QProcessPrivate::~QProcessPrivate()
-{
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcessPrivate: Destructor" );
-#endif
-
- if ( proc != 0 ) {
- if ( proc->socketStdin != 0 ) {
- ::close( proc->socketStdin );
- proc->socketStdin = 0;
- }
- proc->process = 0;
- }
-
- while ( !stdinBuf.isEmpty() ) {
- delete stdinBuf.dequeue();
- }
- delete notifierStdin;
- delete notifierStdout;
- delete notifierStderr;
-}
-
-/*
- Closes all open sockets in the child process that are not needed by the child
- process. Otherwise one child may have an open socket on standard input, etc.
- of another child.
-*/
-void QProcessPrivate::closeOpenSocketsForChild()
-{
- if ( procManager != 0 ) {
- if ( procManager->sigchldFd[0] != 0 )
- ::close( procManager->sigchldFd[0] );
- if ( procManager->sigchldFd[1] != 0 )
- ::close( procManager->sigchldFd[1] );
-
- // close also the sockets from other QProcess instances
- QProc *proc;
- for ( proc=procManager->procList->first(); proc!=0; proc=procManager->procList->next() ) {
- ::close( proc->socketStdin );
- ::close( proc->socketStdout );
- ::close( proc->socketStderr );
- }
- }
-}
-
-void QProcessPrivate::newProc( pid_t pid, QProcess *process )
-{
- proc = new QProc( pid, process );
- if ( procManager == 0 ) {
- procManager = new QProcessManager;
- qprocess_cleanup_procmanager.add( &procManager );
- }
- // the QProcessManager takes care of deleting the QProc instances
- procManager->append( proc );
-}
-
-/***********************************************************************
- *
- * sigchld handler callback
- *
- **********************************************************************/
-QT_SIGNAL_RETTYPE qt_C_sigchldHnd( QT_SIGNAL_ARGS )
-{
- if ( QProcessPrivate::procManager == 0 )
- return;
- if ( QProcessPrivate::procManager->sigchldFd[0] == 0 )
- return;
-
- char a = 1;
- ::write( QProcessPrivate::procManager->sigchldFd[0], &a, sizeof(a) );
-}
-
-
-/***********************************************************************
- *
- * QProcess
- *
- **********************************************************************/
-/*!
- This private class does basic initialization.
-*/
-void QProcess::init()
-{
- d = new QProcessPrivate();
- exitStat = 0;
- exitNormal = FALSE;
-}
-
-/*!
- This private class resets the process variables, etc. so that it can be used
- for another process to start.
-*/
-void QProcess::reset()
-{
- delete d;
- d = new QProcessPrivate();
- exitStat = 0;
- exitNormal = FALSE;
- d->bufStdout.resize( 0 );
- d->bufStderr.resize( 0 );
-}
-
-QByteArray* QProcess::bufStdout()
-{
- if ( d->proc && d->proc->socketStdout ) {
- // ### can this cause a blocking behaviour (maybe do a ioctl() to see
- // if data is available)?
- socketRead( d->proc->socketStdout );
- }
- return &d->bufStdout;
-}
-
-QByteArray* QProcess::bufStderr()
-{
- if ( d->proc && d->proc->socketStderr ) {
- // ### can this cause a blocking behaviour (maybe do a ioctl() to see
- // if data is available)?
- socketRead( d->proc->socketStderr );
- }
- return &d->bufStderr;
-}
-
-void QProcess::consumeBufStdout( int consume )
-{
- uint n = d->bufStdout.size();
- if ( consume==-1 || (uint)consume >= n ) {
- d->bufStdout.resize( 0 );
- } else {
- QByteArray tmp( n - consume );
- memcpy( tmp.data(), d->bufStdout.data()+consume, n-consume );
- d->bufStdout = tmp;
- }
-}
-
-void QProcess::consumeBufStderr( int consume )
-{
- uint n = d->bufStderr.size();
- if ( consume==-1 || (uint)consume >= n ) {
- d->bufStderr.resize( 0 );
- } else {
- QByteArray tmp( n - consume );
- memcpy( tmp.data(), d->bufStderr.data()+consume, n-consume );
- d->bufStderr = tmp;
- }
-}
-
-/*!
- Destroys the class.
-
- If the process is running, it is NOT terminated! Standard input, standard
- output and standard error of the process are closed.
-
- You can connect the destroyed() signal to the kill() slot, if you want the
- process to be terminated automatically when the class is destroyed.
-
- \sa tryTerminate() kill()
-*/
-QProcess::~QProcess()
-{
- delete d;
-}
-
-/*!
- Tries to run a process for the command and arguments that were specified with
- setArguments(), addArgument() or that were specified in the constructor. The
- command is searched in the path for executable programs; you can also use an
- absolute path to the command.
-
- If \a env is null, then the process is started with the same environment as
- the starting process. If \a env is non-null, then the values in the
- stringlist are interpreted as environment setttings of the form \c
- {key=value} and the process is started in these environment settings. For
- convenience, there is a small exception to this rule: under Unix, if \a env
- does not contain any settings for the environment variable \c
- LD_LIBRARY_PATH, then this variable is inherited from the starting process;
- under Windows the same applies for the enverionment varialbe \c PATH.
-
- Returns TRUE if the process could be started, otherwise FALSE.
-
- You can write data to standard input of the process with
- writeToStdin(), you can close standard input with closeStdin() and you can
- terminate the process tryTerminate() resp. kill().
-
- You can call this function even when there already is a running
- process in this object. In this case, QProcess closes standard input
- of the old process and deletes pending data, i.e., you loose all
- control over that process, but the process is not terminated. This applies
- also if the process could not be started. (On operating systems that have
- zombie processes, Qt will also wait() on the old process.)
-
- \sa launch() closeStdin()
-*/
-bool QProcess::start( QStringList *env )
-{
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::start()" );
-#endif
- reset();
-
- int sStdin[2];
- int sStdout[2];
- int sStderr[2];
-
- // open sockets for piping
- if ( (comms & Stdin) && ::socketpair( AF_UNIX, SOCK_STREAM, 0, sStdin ) == -1 ) {
- return FALSE;
- }
- if ( (comms & Stderr) && ::socketpair( AF_UNIX, SOCK_STREAM, 0, sStderr ) == -1 ) {
- return FALSE;
- }
- if ( (comms & Stdout) && ::socketpair( AF_UNIX, SOCK_STREAM, 0, sStdout ) == -1 ) {
- return FALSE;
- }
-
- // the following pipe is only used to determine if the process could be
- // started
- int fd[2];
- if ( pipe( fd ) < 0 ) {
- // non critical error, go on
- fd[0] = 0;
- fd[1] = 0;
- }
-
- // construct the arguments for exec
- QCString *arglistQ = new QCString[ _arguments.count() + 1 ];
- const char** arglist = new const char*[ _arguments.count() + 1 ];
- int i = 0;
- for ( QStringList::Iterator it = _arguments.begin(); it != _arguments.end(); ++it ) {
- arglistQ[i] = (*it).local8Bit();
- arglist[i] = arglistQ[i];
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::start(): arg %d = %s", i, arglist[i] );
-#endif
- i++;
- }
- arglist[i] = 0;
-
- // Must make sure signal handlers are installed before exec'ing
- // in case the process exits quickly.
- if ( d->procManager == 0 ) {
- d->procManager = new QProcessManager;
- qprocess_cleanup_procmanager.add( &d->procManager );
- }
-
- // fork and exec
- QApplication::flushX();
- pid_t pid = fork();
- if ( pid == 0 ) {
- // child
- d->closeOpenSocketsForChild();
- if ( comms & Stdin ) {
- ::close( sStdin[1] );
- ::dup2( sStdin[0], STDIN_FILENO );
- }
- if ( comms & Stdout ) {
- ::close( sStdout[0] );
- ::dup2( sStdout[1], STDOUT_FILENO );
- }
- if ( comms & Stderr ) {
- ::close( sStderr[0] );
- ::dup2( sStderr[1], STDERR_FILENO );
- }
- if ( comms & DupStderr ) {
- ::dup2( STDOUT_FILENO, STDERR_FILENO );
- }
-#ifndef QT_NO_DIR
- ::chdir( workingDir.absPath().latin1() );
-#endif
- if ( fd[0] )
- ::close( fd[0] );
- if ( fd[1] )
- ::fcntl( fd[1], F_SETFD, FD_CLOEXEC ); // close on exec shows sucess
-
- if ( env == 0 ) { // inherit environment and start process
- ::execvp( arglist[0], (char*const*)arglist ); // ### cast not nice
- } else { // start process with environment settins as specified in env
- // construct the environment for exec
- int numEntries = env->count();
- bool setLibraryPath =
- env->grep( QRegExp( "^LD_LIBRARY_PATH=" ) ).isEmpty() &&
- getenv( "LD_LIBRARY_PATH" ) != 0;
- if ( setLibraryPath )
- numEntries++;
- QCString *envlistQ = new QCString[ numEntries + 1 ];
- const char** envlist = new const char*[ numEntries + 1 ];
- int i = 0;
- if ( setLibraryPath ) {
- envlistQ[i] = QString( "LD_LIBRARY_PATH=%1" ).arg( getenv( "LD_LIBRARY_PATH" ) ).local8Bit();
- envlist[i] = envlistQ[i];
- i++;
- }
- for ( QStringList::Iterator it = env->begin(); it != env->end(); ++it ) {
- envlistQ[i] = (*it).local8Bit();
- envlist[i] = envlistQ[i];
- i++;
- }
- envlist[i] = 0;
-
- // look for the executable in the search path
- if ( _arguments.count()>0 && getenv("PATH")!=0 ) {
- QString command = _arguments[0];
- if ( !command.contains( '/' ) ) {
- QStringList pathList = QStringList::split( ':', getenv( "PATH" ) );
- for (QStringList::Iterator it = pathList.begin(); it != pathList.end(); ++it ) {
- QString dir = *it;
-#ifdef Q_OS_MACX
- if(QFile::exists(dir + "/" + command + ".app")) //look in a bundle
- dir += "/" + command + ".app/Contents/MacOS";
-#endif
-#ifndef QT_NO_DIR
- QFileInfo fileInfo( dir, command );
-#else
- QFileInfo fileInfo( dir + "/" + command );
-#endif
- if ( fileInfo.isExecutable() ) {
- arglistQ[0] = fileInfo.filePath().local8Bit();
- arglist[0] = arglistQ[0];
- break;
- }
- }
- }
- }
- ::execve( arglist[0], (char*const*)arglist, (char*const*)envlist ); // ### casts not nice
- }
- if ( fd[1] ) {
- char buf = 0;
- ::write( fd[1], &buf, 1 );
- ::close( fd[1] );
- }
- ::exit( -1 );
- } else if ( pid == -1 ) {
- // error forking
- goto error;
- }
-
- // test if exec was successful
- if ( fd[1] )
- ::close( fd[1] );
- if ( fd[0] ) {
- char buf;
- for ( ;; ) {
- int n = ::read( fd[0], &buf, 1 );
- if ( n==1 ) {
- // socket was not closed => error
- d->proc = 0;
- goto error;
- } else if ( n==-1 ) {
- if ( errno==EAGAIN || errno==EINTR )
- // try it again
- continue;
- }
- break;
- }
- ::close( fd[0] );
- }
-
- d->newProc( pid, this );
-
- if ( comms & Stdin ) {
- ::close( sStdin[0] );
- d->proc->socketStdin = sStdin[1];
- d->notifierStdin = new QSocketNotifier( sStdin[1], QSocketNotifier::Write );
- connect( d->notifierStdin, SIGNAL(activated(int)),
- this, SLOT(socketWrite(int)) );
- // setup notifiers for the sockets
- if ( !d->stdinBuf.isEmpty() ) {
- d->notifierStdin->setEnabled( TRUE );
- }
- }
- if ( comms & Stdout ) {
- ::close( sStdout[1] );
- d->proc->socketStdout = sStdout[0];
- d->notifierStdout = new QSocketNotifier( sStdout[0], QSocketNotifier::Read );
- connect( d->notifierStdout, SIGNAL(activated(int)),
- this, SLOT(socketRead(int)) );
- if ( ioRedirection )
- d->notifierStdout->setEnabled( TRUE );
- }
- if ( comms & Stderr ) {
- ::close( sStderr[1] );
- d->proc->socketStderr = sStderr[0];
- d->notifierStderr = new QSocketNotifier( sStderr[0], QSocketNotifier::Read );
- connect( d->notifierStderr, SIGNAL(activated(int)),
- this, SLOT(socketRead(int)) );
- if ( ioRedirection )
- d->notifierStderr->setEnabled( TRUE );
- }
-
- // cleanup and return
- delete[] arglistQ;
- delete[] arglist;
- return TRUE;
-
-error:
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::start(): error starting process" );
-#endif
- if ( d->procManager )
- d->procManager->cleanup();
- if ( comms & Stdin ) {
- ::close( sStdin[1] );
- ::close( sStdin[0] );
- }
- if ( comms & Stdout ) {
- ::close( sStdout[0] );
- ::close( sStdout[1] );
- }
- if ( comms & Stderr ) {
- ::close( sStderr[0] );
- ::close( sStderr[1] );
- }
- ::close( fd[0] );
- ::close( fd[1] );
- delete[] arglistQ;
- delete[] arglist;
- return FALSE;
-}
-
-
-/*!
- Asks the process to terminate. Processes can ignore this wish. If you want to
- be sure that the process really terminates, you must use kill() instead.
-
- The slot returns immediately: it does not wait until the process has
- finished. When the process really exited, the signal processExited() is
- emitted.
-
- \sa kill() processExited()
-*/
-void QProcess::tryTerminate() const
-{
- if ( d->proc != 0 )
- ::kill( d->proc->pid, SIGTERM );
-}
-
-/*!
- Terminates the process. This is not a safe way to end a process since the
- process will not be able to do cleanup. tryTerminate() is a safer way to do
- it, but processes might ignore a tryTerminate().
-
- The nice way to end a process and to be sure that it is finished, is doing
- something like this:
- \code
- process->tryTerminate();
- QTimer::singleShot( 5000, process, SLOT( kill() ) );
- \endcode
-
- This tries to terminate the process the nice way. If the process is still
- running after 5 seconds, it terminates the process the hard way. The timeout
- should be chosen depending on the time the process needs to do all the
- cleanup: use a higher value if the process is likely to do heavy computation
- on cleanup.
-
- The slot returns immediately: it does not wait until the process has
- finished. When the process really exited, the signal processExited() is
- emitted.
-
- \sa tryTerminate() processExited()
-*/
-void QProcess::kill() const
-{
- if ( d->proc != 0 )
- ::kill( d->proc->pid, SIGKILL );
-}
-
-/*!
- Returns TRUE if the process is running, otherwise FALSE.
-
- \sa normalExit() exitStatus() processExited()
-*/
-bool QProcess::isRunning() const
-{
- if ( d->exitValuesCalculated ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::isRunning(): FALSE (already computed)" );
-#endif
- return FALSE;
- }
- if ( d->proc == 0 )
- return FALSE;
- int status;
- if ( ::waitpid( d->proc->pid, &status, WNOHANG ) == d->proc->pid )
- {
- // compute the exit values
- QProcess *that = (QProcess*)this; // mutable
- that->exitNormal = WIFEXITED( status ) != 0;
- if ( exitNormal ) {
- that->exitStat = (char)WEXITSTATUS( status );
- }
- d->exitValuesCalculated = TRUE;
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::isRunning() (PID: %d): FALSE", d->proc->pid );
-#endif
- return FALSE;
- }
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::isRunning() (PID: %d): TRUE", d->proc->pid );
-#endif
- return TRUE;
-}
-
-/*!
- Writes the data \a buf to the standard input of the process. The process may
- or may not read this data.
-
- This function returns immediately; the QProcess class might write the data at
- a later point (you have to enter the event loop for that). When all the data
- is written to the process, the signal wroteToStdin() is emitted. This does
- not mean that the process really read the data, since this class only detects
- when it was able to write the data to the operating system.
-
- \sa wroteToStdin() closeStdin() readStdout() readStderr()
-*/
-void QProcess::writeToStdin( const QByteArray& buf )
-{
-#if defined(QT_QPROCESS_DEBUG)
-// qDebug( "QProcess::writeToStdin(): write to stdin (%d)", d->socketStdin );
-#endif
- d->stdinBuf.enqueue( new QByteArray(buf) );
- if ( d->notifierStdin != 0 )
- d->notifierStdin->setEnabled( TRUE );
-}
-
-
-/*!
- Closes standard input of the process.
-
- This function also deletes pending data that is not written to standard input
- yet.
-
- \sa wroteToStdin()
-*/
-void QProcess::closeStdin()
-{
- if ( d->proc == 0 )
- return;
- if ( d->proc->socketStdin !=0 ) {
- while ( !d->stdinBuf.isEmpty() ) {
- delete d->stdinBuf.dequeue();
- }
- delete d->notifierStdin;
- d->notifierStdin = 0;
- if ( ::close( d->proc->socketStdin ) != 0 ) {
- qWarning( "Could not close stdin of child process" );
- }
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::closeStdin(): stdin (%d) closed", d->proc->socketStdin );
-#endif
- d->proc->socketStdin = 0;
- }
-}
-
-
-/*
- This private slot is called when the process has outputted data to either
- standard output or standard error.
-*/
-void QProcess::socketRead( int fd )
-{
- if ( d->socketReadCalled ) {
- // the slots that are connected to the readyRead...() signals might
- // trigger a recursive call of socketRead(). Avoid this since you get a
- // blocking read otherwise.
- return;
- }
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::socketRead(): %d", fd );
-#endif
- if ( fd == 0 )
- return;
- const int bufsize = 4096;
- QByteArray *buffer = 0;
- uint oldSize;
- int n;
- if ( fd == d->proc->socketStdout ) {
- buffer = &d->bufStdout;
- } else if ( fd == d->proc->socketStderr ) {
- buffer = &d->bufStderr;
- } else {
- // this case should never happen, but just to be safe
- return;
- }
-
- // read data
- oldSize = buffer->size();
- buffer->resize( oldSize + bufsize );
- n = ::read( fd, buffer->data()+oldSize, bufsize );
- if ( n > 0 )
- buffer->resize( oldSize + n );
- else
- buffer->resize( oldSize );
- // eof or error?
- if ( n == 0 || n == -1 ) {
- if ( fd == d->proc->socketStdout ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::socketRead(): stdout (%d) closed", fd );
-#endif
- d->notifierStdout->setEnabled( FALSE );
- delete d->notifierStdout;
- d->notifierStdout = 0;
- ::close( d->proc->socketStdout );
- d->proc->socketStdout = 0;
- return;
- } else if ( fd == d->proc->socketStderr ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::socketRead(): stderr (%d) closed", fd );
-#endif
- d->notifierStderr->setEnabled( FALSE );
- delete d->notifierStderr;
- d->notifierStderr = 0;
- ::close( d->proc->socketStderr );
- d->proc->socketStderr = 0;
- return;
- }
- }
- // read all data that is available
- while ( n == bufsize ) {
- oldSize = buffer->size();
- buffer->resize( oldSize + bufsize );
- n = ::read( fd, buffer->data()+oldSize, bufsize );
- if ( n > 0 )
- buffer->resize( oldSize + n );
- else
- buffer->resize( oldSize );
- }
-
- d->socketReadCalled = TRUE;
- if ( fd == d->proc->socketStdout ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::socketRead(): %d bytes read from stdout (%d)",
- buffer->size()-oldSize, fd );
-#endif
- emit readyReadStdout();
- } else if ( fd == d->proc->socketStderr ) {
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::socketRead(): %d bytes read from stderr (%d)",
- buffer->size()-oldSize, fd );
-#endif
- emit readyReadStderr();
- }
- d->socketReadCalled = FALSE;
-}
-
-
-/*
- This private slot is called when the process tries to read data from standard
- input.
-*/
-void QProcess::socketWrite( int fd )
-{
- if ( fd != d->proc->socketStdin || d->proc->socketStdin == 0 )
- return;
- if ( d->stdinBuf.isEmpty() ) {
- d->notifierStdin->setEnabled( FALSE );
- return;
- }
-#if defined(QT_QPROCESS_DEBUG)
- qDebug( "QProcess::socketWrite(): write to stdin (%d)", fd );
-#endif
- ssize_t ret = ::write( fd,
- d->stdinBuf.head()->data() + d->stdinBufRead,
- d->stdinBuf.head()->size() - d->stdinBufRead );
- if ( ret > 0 )
- d->stdinBufRead += ret;
- if ( d->stdinBufRead == (ssize_t)d->stdinBuf.head()->size() ) {
- d->stdinBufRead = 0;
- delete d->stdinBuf.dequeue();
- if ( wroteToStdinConnected && d->stdinBuf.isEmpty() )
- emit wroteToStdin();
- socketWrite( fd );
- }
-}
-
-/*!
- \internal
- Flushes standard input. This is useful if you want to use QProcess in a
- synchronous manner.
-
- This function should probably go into the public API.
-*/
-void QProcess::flushStdin()
-{
- socketWrite( d->proc->socketStdin );
-}
-
-/*
- This private slot is only used under Windows (but moc does not know about #if
- defined()).
-*/
-void QProcess::timeout()
-{
-}
-
-
-/*
- This private function is used by connectNotify() and disconnectNotify() to
- change the value of ioRedirection (and related behaviour)
-*/
-void QProcess::setIoRedirection( bool value )
-{
- ioRedirection = value;
- if ( ioRedirection ) {
- if ( d->notifierStdout )
- d->notifierStdout->setEnabled( TRUE );
- if ( d->notifierStderr )
- d->notifierStderr->setEnabled( TRUE );
- } else {
- if ( d->notifierStdout )
- d->notifierStdout->setEnabled( FALSE );
- if ( d->notifierStderr )
- d->notifierStderr->setEnabled( FALSE );
- }
-}
-
-/*
- This private function is used by connectNotify() and
- disconnectNotify() to change the value of notifyOnExit (and related
- behaviour)
-*/
-void QProcess::setNotifyOnExit( bool value )
-{
- notifyOnExit = value;
-}
-
-/*
- This private function is used by connectNotify() and disconnectNotify() to
- change the value of wroteToStdinConnected (and related behaviour)
-*/
-void QProcess::setWroteStdinConnected( bool value )
-{
- wroteToStdinConnected = value;
-}
-
-/*! \enum QProcess::PID
- \internal
-*/
-/*!
- Returns platform dependent information about the process. This can be used
- together with platform specific system calls.
-
- Under Unix the return value is the PID of the process, or -1 if no process is
- belonging to this object.
-
- Under Windows it is a pointer to the \c PROCESS_INFORMATION struct, or 0 if
- no process is belonging to this object.
-*/
-QProcess::PID QProcess::processIdentifier()
-{
- if ( d->proc == 0 )
- return -1;
- return d->proc->pid;
-}
-
-#endif // QT_NO_PROCESS
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index cbda247..0337a94 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -29,9 +29,10 @@
#include <qglobal.h>
#ifndef _OS_LINUX_
-extern "C" {
+extern "C"
+{
#include <uuid/uuid.h>
#define UUID_H_INCLUDED
}
@@ -58,9 +59,9 @@ extern "C" {
#include <qpe/version.h>
#include <qpe/qcopenvelope_qws.h>
#include "transferserver.h"
-#include "qprocess.h"
+#include <opie/oprocess.h>
const int block_size = 51200;
TransferServer::TransferServer( Q_UINT16 port, QObject *parent ,
@@ -72,9 +73,8 @@ TransferServer::TransferServer( Q_UINT16 port, QObject *parent ,
}
TransferServer::~TransferServer()
{
-
}
void TransferServer::newConnection( int socket )
{
@@ -84,14 +84,18 @@ void TransferServer::newConnection( int socket )
/*
* small class in anonymous namespace
* to generate a QUUid for us
*/
-namespace {
- struct UidGen {
+namespace
+{
+struct UidGen
+{
QString uuid();
};
#if !defined(_OS_LINUX_)
- QString UidGen::uuid() {
+
+QString UidGen::uuid()
+{
uuid_t uuid;
uuid_generate( uuid );
return QUUid( uuid ).toString();
}
@@ -99,9 +103,10 @@ namespace {
/*
* linux got a /proc/sys/kernel/random/uuid file
* it'll generate the uuids for us
*/
- QString UidGen::uuid() {
+QString UidGen::uuid()
+{
QFile file( "/proc/sys/kernel/random/uuid" );
if (!file.open(IO_ReadOnly ) )
return QString::null;
@@ -162,9 +167,10 @@ int SyncAuthentication::isAuthorized(QHostAddress peeraddress)
}
bool SyncAuthentication::checkUser( const QString& user )
{
- if ( user.isEmpty() ) return FALSE;
+ if ( user.isEmpty() )
+ return FALSE;
QString euser = loginName();
return user == euser;
}
@@ -229,14 +235,14 @@ bool SyncAuthentication::checkPassword( const QString& password )
if ( (denials > 2 && now < lastdenial+600)
|| QMessageBox::warning(0,tr("Sync Connection"),
tr("<p>An unrecognized system is requesting access to this device."
"<p>If you have just initiated a Sync for the first time, this is normal."),
- tr("Allow"),tr("Deny"), 0, 1, 1 ) ==1 )
- {
+ tr("Allow"), tr("Deny"), 0, 1, 1 ) == 1 ) {
denials++;
lastdenial=now;
return FALSE;
- } else {
+ }
+ else {
denials=0;
cfg.writeEntry("Passwords",pwds+" "+cpassword);
return TRUE;
}
@@ -255,12 +261,14 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name )
peerport = peerPort();
peeraddress = peerAddress();
#ifndef INSECURE
+
if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
state = Forbidden;
startTimer( 0 );
- } else
+ }
+ else
#endif
{
connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
@@ -292,9 +300,8 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name )
}
ServerPI::~ServerPI()
{
-
}
void ServerPI::connectionClosed()
{
@@ -350,9 +357,10 @@ void ServerPI::process( const QString& message )
//qDebug( "Command: %s", message.latin1() );
// split message using "," as separator
QStringList msg = QStringList::split( " ", message );
- if ( msg.isEmpty() ) return;
+ if ( msg.isEmpty() )
+ return ;
// command token
QString cmd = msg[0].upper();
@@ -589,9 +597,10 @@ void ServerPI::process( const QString& message )
if ( file.remove() ) {
send( "250 Requested file action okay, completed" );
QCopEnvelope e("QPE/System", "linkChanged(QString)" );
e << file.name();
- } else {
+ }
+ else {
send( "550 Requested action not taken" );
}
}
}
@@ -733,9 +742,10 @@ void ServerPI::sendFile( const QString& file )
else {
QStringList targets;
if ( backupRestoreGzip( file, targets ) )
dtp->sendGzipFile( file, targets, peeraddress, peerport );
- else dtp->sendFile( file, peeraddress, peerport );
+ else
+ dtp->sendFile( file, peeraddress, peerport );
}
}
void ServerPI::retrieveFile( const QString& file )
@@ -757,9 +767,10 @@ void ServerPI::retrieveFile( const QString& file )
bool ServerPI::parsePort( const QString& pp )
{
QStringList p = QStringList::split( ",", pp );
- if ( p.count() != 6 ) return FALSE;
+ if ( p.count() != 6 )
+ return FALSE;
// h1,h2,h3,h4,p1,p2
peeraddress = QHostAddress( ( p[0].toInt() << 24 ) + ( p[1].toInt() << 16 ) +
( p[2].toInt() << 8 ) + p[3].toInt() );
@@ -809,9 +820,10 @@ bool ServerPI::sendList( const QString& arg )
if ( fn.isEmpty() )
fn = directory.path();
QFileInfo fi( fn );
- if ( !fi.exists() ) return FALSE;
+ if ( !fi.exists() )
+ return FALSE;
// return file listing
if ( fi.isFile() ) {
ts << fileListing( &fi ) << endl;
@@ -857,9 +869,10 @@ bool ServerPI::sendList( const QString& arg )
}
QString ServerPI::fileListing( QFileInfo *info )
{
- if ( !info ) return QString::null;
+ if ( !info )
+ return QString::null;
QString s;
// type char
if ( info->isDir() )
@@ -907,43 +920,63 @@ QString ServerPI::fileListing( QFileInfo *info )
}
QString ServerPI::permissionString( QFileInfo *info )
{
- if ( !info ) return QString( "---------" );
+ if ( !info )
+ return QString( "---------" );
QString s;
// user
- if ( info->permission( QFileInfo::ReadUser ) ) s += "r";
- else s += "-";
- if ( info->permission( QFileInfo::WriteUser ) ) s += "w";
- else s += "-";
- if ( info->permission( QFileInfo::ExeUser ) ) s += "x";
- else s += "-";
+ if ( info->permission( QFileInfo::ReadUser ) )
+ s += "r";
+ else
+ s += "-";
+ if ( info->permission( QFileInfo::WriteUser ) )
+ s += "w";
+ else
+ s += "-";
+ if ( info->permission( QFileInfo::ExeUser ) )
+ s += "x";
+ else
+ s += "-";
// group
- if ( info->permission( QFileInfo::ReadGroup ) ) s += "r";
- else s += "-";
- if ( info->permission( QFileInfo::WriteGroup ) )s += "w";
- else s += "-";
- if ( info->permission( QFileInfo::ExeGroup ) ) s += "x";
- else s += "-";
+ if ( info->permission( QFileInfo::ReadGroup ) )
+ s += "r";
+ else
+ s += "-";
+ if ( info->permission( QFileInfo::WriteGroup ) )
+ s += "w";
+ else
+ s += "-";
+ if ( info->permission( QFileInfo::ExeGroup ) )
+ s += "x";
+ else
+ s += "-";
// exec
- if ( info->permission( QFileInfo::ReadOther ) ) s += "r";
- else s += "-";
- if ( info->permission( QFileInfo::WriteOther ) ) s += "w";
- else s += "-";
- if ( info->permission( QFileInfo::ExeOther ) ) s += "x";
- else s += "-";
+ if ( info->permission( QFileInfo::ReadOther ) )
+ s += "r";
+ else
+ s += "-";
+ if ( info->permission( QFileInfo::WriteOther ) )
+ s += "w";
+ else
+ s += "-";
+ if ( info->permission( QFileInfo::ExeOther ) )
+ s += "x";
+ else
+ s += "-";
return s;
}
void ServerPI::newConnection( int socket )
{
//qDebug( "New incomming connection" );
- if ( !passiv ) return;
+ if ( !passiv )
+ return ;
if ( wait[SendFile] ) {
QStringList targets;
if ( backupRestoreGzip( waitfile, targets ) )
@@ -977,9 +1010,10 @@ void ServerPI::newConnection( int socket )
}
QString ServerPI::absFilePath( const QString& file )
{
- if ( file.isEmpty() ) return file;
+ if ( file.isEmpty() )
+ return file;
QString filepath( file );
if ( file[0] != "/" )
filepath = directory.path() + "/" + file;
@@ -1003,24 +1037,21 @@ retrieveTargzProc( 0 ), gzipProc( 0 )
connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
connect( this, SIGNAL( bytesWritten( int ) ), SLOT( bytesWritten( int ) ) );
connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) );
- gzipProc = new QProcess( this, "gzipProc" );
- gzipProc->setCommunication( QProcess::Stdin | QProcess::Stdout );
+ gzipProc = new OProcess( this, "gzipProc" );
- createTargzProc = new QProcess( QString("tar"), this, "createTargzProc");
- createTargzProc->setCommunication( QProcess::Stdout );
+ createTargzProc = new OProcess( QString("tar"), this, "createTargzProc");
createTargzProc->setWorkingDirectory( QDir::rootDirPath() );
- connect( createTargzProc, SIGNAL( processExited() ), SLOT( targzDone() ) );
+ connect( createTargzProc, SIGNAL( processExited(OProcess *) ), SLOT( targzDone() ) );
QStringList args = "tar";
args += "-xv";
- retrieveTargzProc = new QProcess( args, this, "retrieveTargzProc" );
- retrieveTargzProc->setCommunication( QProcess::Stdin );
+ retrieveTargzProc = new OProcess( args, this, "retrieveTargzProc" );
retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() );
- connect( retrieveTargzProc, SIGNAL( processExited() ),
+ connect( retrieveTargzProc, SIGNAL( processExited(OProcess *) ),
SIGNAL( completed() ) );
- connect( retrieveTargzProc, SIGNAL( processExited() ),
+ connect( retrieveTargzProc, SIGNAL( processExited(OProcess *) ),
SLOT( extractTarDone() ) );
}
ServerDTP::~ServerDTP()
@@ -1033,8 +1064,9 @@ ServerDTP::~ServerDTP()
void ServerDTP::extractTarDone()
{
qDebug("extract done");
#ifndef QT_NO_COP
+
QCopEnvelope e( "QPE/Desktop", "restoreDone(QString)" );
e << file.name();
#endif
}
@@ -1057,9 +1089,10 @@ void ServerDTP::connected()
//make sure it doesn't hang on empty files
file.close();
emit completed();
mode = Idle;
- } else {
+ }
+ else {
if( !file.atEnd() ) {
QCString s;
s.resize( block_size );
@@ -1076,12 +1109,12 @@ void ServerDTP::connected()
}
bytes_written = 0;
qDebug("==>start send tar process");
- if ( !createTargzProc->start() )
+ if ( !createTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdout) )
qWarning("Error starting %s or %s",
- createTargzProc->arguments().join(" ").latin1(),
- gzipProc->arguments().join(" ").latin1() );
+ createTargzProc->args()[0].data(),
+ gzipProc->args()[0].data());
break;
case SendBuffer:
if ( !buf.open( IO_ReadOnly) ) {
emit failed();
@@ -1211,14 +1244,14 @@ void ServerDTP::readyRead()
file.writeBlock( s.data(), s.size() );
}
else if ( RetrieveGzipFile == mode ) {
if ( !gzipProc->isRunning() )
- gzipProc->start();
+ gzipProc->start(OProcess::NotifyOnExit, (OProcess::Communication) ( OProcess::Stdin | OProcess::Stdout ));
QByteArray s;
s.resize( bytesAvailable() );
readBlock( s.data(), bytesAvailable() );
- gzipProc->writeToStdin( s );
+ gzipProc->writeStdin( s.data(), s.size() );
qDebug("wrote %d bytes to ungzip ", s.size() );
}
// retrieve buffer mode
else if ( RetrieveBuffer == mode ) {
@@ -1228,38 +1261,37 @@ void ServerDTP::readyRead()
buf.writeBlock( s.data(), s.size() );
}
}
-void ServerDTP::writeTargzBlock()
+void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen)
{
- QByteArray block = gzipProc->readStdout();
- writeBlock( block.data(), block.size() );
- qDebug("writeTargzBlock %d", block.size());
+ writeBlock( buffer, buflen );
+ qDebug("writeTargzBlock %d", buflen);
if ( !createTargzProc->isRunning() ) {
qDebug("tar and gzip done");
emit completed();
mode = Idle;
- disconnect( gzipProc, SIGNAL( readyReadStdout() ),
- this, SLOT( writeTargzBlock() ) );
+ disconnect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int ) ),
+ this, SLOT( writeTargzBlock(OProcess *, char *, int) ) );
}
}
void ServerDTP::targzDone()
{
//qDebug("targz done");
- disconnect( createTargzProc, SIGNAL( readyReadStdout() ),
- this, SLOT( gzipTarBlock() ) );
+ disconnect( createTargzProc, SIGNAL( receivedStdout(OProcess *, char *, int) ),
+ this, SLOT( gzipTarBlock(OProcess *, char *, int) ) );
gzipProc->closeStdin();
}
-void ServerDTP::gzipTarBlock()
+void ServerDTP::gzipTarBlock(OProcess *, char *buffer, int buflen)
{
//qDebug("gzipTarBlock");
if ( !gzipProc->isRunning() ) {
//qDebug("auto start gzip proc");
- gzipProc->start();
+ gzipProc->start(OProcess::NotifyOnExit, (OProcess::Communication) ( OProcess::Stdin | OProcess::Stdout ));
}
- gzipProc->writeToStdin( createTargzProc->readStdout() );
+ gzipProc->writeStdin( buffer, buflen );
}
void ServerDTP::sendFile( const QString fn, const QHostAddress& host, Q_UINT16 port )
{
@@ -1291,36 +1323,38 @@ void ServerDTP::sendGzipFile( const QString &fn,
QStringList args = "tar";
args += "-cv";
args += archiveTargets;
qDebug("sendGzipFile %s", args.join(" ").latin1() );
- createTargzProc->setArguments( args );
+ createTargzProc->clearArguments( );
+ *createTargzProc << args;
connect( createTargzProc,
- SIGNAL( readyReadStdout() ), SLOT( gzipTarBlock() ) );
+ SIGNAL( receivedStdout(OProcess *, char *, int) ), SLOT( gzipTarBlock(OProcess *, char *, int) ) );
- gzipProc->setArguments( "gzip" );
- connect( gzipProc, SIGNAL( readyReadStdout() ),
- SLOT( writeTargzBlock() ) );
+ gzipProc->clearArguments( );
+ *gzipProc << "gzip";
+ connect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int) ),
+ SLOT( writeTargzBlock(OProcess *, char *, int) ) );
}
void ServerDTP::gunzipDone()
{
qDebug("gunzipDone");
disconnect( gzipProc, SIGNAL( processExited() ),
this, SLOT( gunzipDone() ) );
retrieveTargzProc->closeStdin();
- disconnect( gzipProc, SIGNAL( readyReadStdout() ),
- this, SLOT( tarExtractBlock() ) );
+ disconnect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int) ),
+ this, SLOT( tarExtractBlock(OProcess *, char *, int) ) );
}
-void ServerDTP::tarExtractBlock()
+void ServerDTP::tarExtractBlock(OProcess *, char *buffer, int buflen)
{
- qDebug("ungzipTarBlock");
+ qDebug("tarExtractBlock");
if ( !retrieveTargzProc->isRunning() ) {
qDebug("auto start ungzip proc");
- if ( !retrieveTargzProc->start() )
+ if ( !retrieveTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdin) )
qWarning(" failed to start tar -x process");
}
- retrieveTargzProc->writeToStdin( gzipProc->readStdout() );
+ retrieveTargzProc->writeStdin( buffer, buflen );
}
void ServerDTP::retrieveFile( const QString fn, const QHostAddress& host, Q_UINT16 port )
@@ -1341,9 +1375,10 @@ void ServerDTP::retrieveGzipFile( const QString &fn )
qDebug("retrieveGzipFile %s", fn.latin1());
file.setName( fn );
mode = RetrieveGzipFile;
- gzipProc->setArguments( "gunzip" );
+ gzipProc->clearArguments();
+ *gzipProc << "gunzip";
connect( gzipProc, SIGNAL( readyReadStdout() ),
SLOT( tarExtractBlock() ) );
connect( gzipProc, SIGNAL( processExited() ),
SLOT( gunzipDone() ) );
diff --git a/core/launcher/transferserver.h b/core/launcher/transferserver.h
index a3bb060..1c5ab4b 100644
--- a/core/launcher/transferserver.h
+++ b/core/launcher/transferserver.h
@@ -23,9 +23,9 @@
#include <qfile.h>
#include <qbuffer.h>
class QFileInfo;
-class QProcess;
+class OProcess;
class TransferServer : public QServerSocket
{
Q_OBJECT
@@ -91,13 +91,13 @@ private slots:
void connectionClosed();
void connected();
void bytesWritten( int bytes );
void readyRead();
- void writeTargzBlock();
+ void writeTargzBlock(OProcess *, char *, int);
void targzDone();
- void gzipTarBlock();
- void tarExtractBlock();
+ void gzipTarBlock(OProcess *, char *, int);
+ void tarExtractBlock(OProcess *, char *, int);
void gunzipDone();
void extractTarDone();
private:
@@ -105,11 +105,11 @@ private:
unsigned long bytes_written;
Mode mode;
QFile file;
QBuffer buf;
- QProcess *createTargzProc;
- QProcess *retrieveTargzProc;
- QProcess *gzipProc;
+ OProcess *createTargzProc;
+ OProcess *retrieveTargzProc;
+ OProcess *gzipProc;
};
class ServerSocket : public QServerSocket
{