| -rw-r--r-- | libopie2/opiecore/oprocess.cpp | 689 | ||||
| -rw-r--r-- | libopie2/opiecore/oprocess.h | 152 |
2 files changed, 393 insertions, 448 deletions
diff --git a/libopie2/opiecore/oprocess.cpp b/libopie2/opiecore/oprocess.cpp index fb51bf9..f1a5f3b 100644 --- a/libopie2/opiecore/oprocess.cpp +++ b/libopie2/opiecore/oprocess.cpp @@ -1,70 +1,57 @@ /* - - $Id$ - - This file is part of the KDE libraries - Copyright (C) 1997 Christian Czezatke (e9025461@student.tuwien.ac.at) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - + This file is part of the Opie Project + Copyright (C) 2002-2004 Holger Freyther <zecke@handhelds.org> + and The Opie Team <opie-devel@handhelds.org> + =. Based on KProcess (C) 1997 Christian Czezatke (e9025461@student.tuwien.ac.at) + .=l. + .>+-= +_;:, .> :=|. This program is free software; you can +.> <`_, > . <= redistribute it and/or modify it under +:`=1 )Y*s>-.-- : the terms of the GNU Library General Public +.="- .-=="i, .._ License as published by the Free Software +- . .-<_> .<> Foundation; either version 2 of the License, + ._= =} : or (at your option) any later version. + .%`+i> _;_. + .i_,=:_. -<s. This program 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 +..}^=.= = ; Library General Public License for more +++= -. .` .: details. +: = ...= . :.=- +-. .:....=;==+<; You should have received a copy of the GNU + -_. . . )=. = Library General Public License along with + -- :-=` this library; see the file COPYING.LIB. + If not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ - -// -// KPROCESS -- A class for handling child processes in KDE without -// having to take care of Un*x specific implementation details -// -// version 0.3.1, Jan 8th 1998 -// -// (C) Christian Czezatke -// e9025461@student.tuwien.ac.at -// -// Changes: -// -// March 2nd, 1998: Changed parameter list for KShellProcess: -// Arguments are now placed in a single string so that -// <shell> -c <commandstring> is passed to the shell -// to make the use of "operator<<" consistent with KProcess -// -// -// Ported by Holger Freyther -// <zekce> Harlekin: oprocess and say it was ported to Qt by the Opie developers an Qt 2 - - - -#include "oprocess.h" -#define _MAY_INCLUDE_KPROCESSCONTROLLER_ #include "oprocctrl.h" -//#include <config.h> +/* OPIE */ +#include <opie2/oprocess.h> + +/* QT */ +#include <qapplication.h> #include <qfile.h> -#include <qsocketnotifier.h> +#include <qmap.h> #include <qregexp.h> +#include <qsocketnotifier.h> -#include <sys/time.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> - +/* STD */ #include <errno.h> #include <fcntl.h> +#include <pwd.h> #include <stdlib.h> #include <signal.h> #include <stdio.h> #include <string.h> +#include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/socket.h> #include <unistd.h> #ifdef HAVE_SYS_SELECT_H @@ -74,21 +61,13 @@ #include <grp.h> #endif -#include <pwd.h> - -#include <qapplication.h> -#include <qmap.h> -//#include <kdebug.h> - -///////////////////////////// -// public member functions // -///////////////////////////// class OProcessPrivate { public: - OProcessPrivate() : useShell(false) { } + OProcessPrivate() : useShell( false ) + { } bool useShell; - QMap<QString,QString> env; + QMap<QString, QString> env; QString wd; QCString shell; @@ -96,12 +75,12 @@ public: -OProcess::OProcess(QObject *parent, const char *name) - : QObject(parent, name) +OProcess::OProcess( QObject *parent, const char *name ) + : QObject( parent, name ) { init ( ); } -OProcess::OProcess(const QString &arg0, QObject *parent, const char *name) - : QObject(parent, name) +OProcess::OProcess( const QString &arg0, QObject *parent, const char *name ) + : QObject( parent, name ) { init ( ); @@ -109,6 +88,6 @@ OProcess::OProcess(const QString &arg0, QObject *parent, const char *name) } -OProcess::OProcess(const QStringList &args, QObject *parent, const char *name) - : QObject(parent, name) +OProcess::OProcess( const QStringList &args, QObject *parent, const char *name ) + : QObject( parent, name ) { init ( ); @@ -132,59 +111,53 @@ void OProcess::init ( ) d = 0; - if (0 == OProcessController::theOProcessController) + if ( 0 == OProcessController::theOProcessController ) { - (void) new OProcessController(); - CHECK_PTR(OProcessController::theOProcessController); + ( void ) new OProcessController(); + CHECK_PTR( OProcessController::theOProcessController ); } - OProcessController::theOProcessController->addOProcess(this); - out[0] = out[1] = -1; - in[0] = in[1] = -1; - err[0] = err[1] = -1; + OProcessController::theOProcessController->addOProcess( this ); + out[ 0 ] = out[ 1 ] = -1; + in[ 0 ] = in[ 1 ] = -1; + err[ 0 ] = err[ 1 ] = -1; } -void -OProcess::setEnvironment(const QString &name, const QString &value) +void OProcess::setEnvironment( const QString &name, const QString &value ) { - if (!d) + if ( !d ) d = new OProcessPrivate; - d->env.insert(name, value); + d->env.insert( name, value ); } -void -OProcess::setWorkingDirectory(const QString &dir) +void OProcess::setWorkingDirectory( const QString &dir ) { - if (!d) + if ( !d ) d = new OProcessPrivate; d->wd = dir; } -void -OProcess::setupEnvironment() +void OProcess::setupEnvironment() { - if (d) + if ( d ) { - QMap<QString,QString>::Iterator it; - for(it = d->env.begin(); it != d->env.end(); ++it) - setenv(QFile::encodeName(it.key()).data(), - QFile::encodeName(it.data()).data(), 1); - if (!d->wd.isEmpty()) - chdir(QFile::encodeName(d->wd).data()); + QMap<QString, QString>::Iterator it; + for ( it = d->env.begin(); it != d->env.end(); ++it ) + setenv( QFile::encodeName( it.key() ).data(), + QFile::encodeName( it.data() ).data(), 1 ); + if ( !d->wd.isEmpty() ) + chdir( QFile::encodeName( d->wd ).data() ); } } -void -OProcess::setRunPrivileged(bool keepPrivileges) +void OProcess::setRunPrivileged( bool keepPrivileges ) { keepPrivs = keepPrivileges; } -bool -OProcess::runPrivileged() const +bool OProcess::runPrivileged() const { return keepPrivs; } - OProcess::~OProcess() { @@ -194,10 +167,10 @@ OProcess::~OProcess() // "DontCare") - OProcessController::theOProcessController->removeOProcess(this); + OProcessController::theOProcessController->removeOProcess( this ); // this must happen before we kill the child // TODO: block the signal while removing the current process from the process list - if (runs && (run_mode != DontCare)) - kill(SIGKILL); + if ( runs && ( run_mode != DontCare ) ) + kill( SIGKILL ); // Clean up open fd's and socket notifiers. @@ -212,5 +185,5 @@ OProcess::~OProcess() void OProcess::detach() { - OProcessController::theOProcessController->removeOProcess(this); + OProcessController::theOProcessController->removeOProcess( this ); runs = false; @@ -223,39 +196,41 @@ void OProcess::detach() } -bool OProcess::setExecutable(const QString& proc) +bool OProcess::setExecutable( const QString& proc ) { - if (runs) return false; + if ( runs ) + return false; - if (proc.isEmpty()) return false; + if ( proc.isEmpty() ) + return false; - if (!arguments.isEmpty()) - arguments.remove(arguments.begin()); - arguments.prepend(QFile::encodeName(proc)); + if ( !arguments.isEmpty() ) + arguments.remove( arguments.begin() ); + arguments.prepend( QFile::encodeName( proc ) ); return true; } -OProcess &OProcess::operator<<(const QStringList& args) +OProcess &OProcess::operator<<( const QStringList& args ) { QStringList::ConstIterator it = args.begin(); for ( ; it != args.end() ; ++it ) - arguments.append(QFile::encodeName(*it)); + arguments.append( QFile::encodeName( *it ) ); return *this; } -OProcess &OProcess::operator<<(const QCString& arg) +OProcess &OProcess::operator<<( const QCString& arg ) { - return operator<< (arg.data()); + return operator<< ( arg.data() ); } -OProcess &OProcess::operator<<(const char* arg) +OProcess &OProcess::operator<<( const char* arg ) { - arguments.append(arg); + arguments.append( arg ); return *this; } -OProcess &OProcess::operator<<(const QString& arg) +OProcess &OProcess::operator<<( const QString& arg ) { - arguments.append(QFile::encodeName(arg)); + arguments.append( QFile::encodeName( arg ) ); return *this; } @@ -266,5 +241,5 @@ void OProcess::clearArguments() } -bool OProcess::start(RunMode runmode, Communication comm) +bool OProcess::start( RunMode runmode, Communication comm ) { uint i; @@ -272,5 +247,5 @@ bool OProcess::start(RunMode runmode, Communication comm) char **arglist; - if (runs || (0 == n)) + if ( runs || ( 0 == n ) ) { return false; // cannot start a process that is already running @@ -281,7 +256,7 @@ bool OProcess::start(RunMode runmode, Communication comm) QCString shellCmd; - if (d && d->useShell) + if ( d && d->useShell ) { - if (d->shell.isEmpty()) + if ( d->shell.isEmpty() ) { qWarning( "Could not find a valid shell" ); @@ -289,26 +264,26 @@ bool OProcess::start(RunMode runmode, Communication comm) } - arglist = static_cast<char **>(malloc( (4)*sizeof(char *))); - for (i=0; i < n; i++) + arglist = static_cast<char **>( malloc( ( 4 ) * sizeof( char * ) ) ); + for ( i = 0; i < n; i++ ) { - shellCmd += arguments[i]; + shellCmd += arguments[ i ]; shellCmd += " "; // CC: to separate the arguments } - arglist[0] = d->shell.data(); - arglist[1] = (char *) "-c"; - arglist[2] = shellCmd.data(); - arglist[3] = 0; + arglist[ 0 ] = d->shell.data(); + arglist[ 1 ] = ( char * ) "-c"; + arglist[ 2 ] = shellCmd.data(); + arglist[ 3 ] = 0; } else { - arglist = static_cast<char **>(malloc( (n+1)*sizeof(char *))); - for (i=0; i < n; i++) - arglist[i] = arguments[i].data(); - arglist[n]= 0; + arglist = static_cast<char **>( malloc( ( n + 1 ) * sizeof( char * ) ) ); + for ( i = 0; i < n; i++ ) + arglist[ i ] = arguments[ i ].data(); + arglist[ n ] = 0; } - if (!setupCommunication(comm)) - qWarning( "Could not setup Communication!"); + if ( !setupCommunication( comm ) ) + qWarning( "Could not setup Communication!" ); // We do this in the parent because if we do it in the child process @@ -317,11 +292,12 @@ bool OProcess::start(RunMode runmode, Communication comm) gid_t gid = getgid(); #ifdef HAVE_INITGROUPS - struct passwd *pw = getpwuid(uid); + + struct passwd *pw = getpwuid( uid ); #endif - int fd[2]; - if (0 > pipe(fd)) + int fd[ 2 ]; + if ( 0 > pipe( fd ) ) { - fd[0] = fd[1] = 0; // Pipe failed.. continue + fd[ 0 ] = fd[ 1 ] = 0; // Pipe failed.. continue } @@ -334,19 +310,21 @@ bool OProcess::start(RunMode runmode, Communication comm) pid_ = fork(); - if (0 == pid_) + if ( 0 == pid_ ) { - if (fd[0]) - close(fd[0]); - if (!runPrivileged()) + if ( fd[ 0 ] ) + close( fd[ 0 ] ); + if ( !runPrivileged() ) { - setgid(gid); + setgid( gid ); #if defined( HAVE_INITGROUPS) - if(pw) - initgroups(pw->pw_name, pw->pw_gid); + + if ( pw ) + initgroups( pw->pw_name, pw->pw_gid ); #endif - setuid(uid); + + setuid( uid ); } // The child process - if(!commSetupDoneC()) + if ( !commSetupDoneC() ) qWarning( "Could not finish comm setup in child!" ); @@ -354,36 +332,36 @@ bool OProcess::start(RunMode runmode, Communication comm) // Matthias - if (run_mode == DontCare) - setpgid(0,0); + if ( run_mode == DontCare ) + setpgid( 0, 0 ); // restore default SIGPIPE handler (Harri) struct sigaction act; - sigemptyset(&(act.sa_mask)); - sigaddset(&(act.sa_mask), SIGPIPE); + sigemptyset( &( act.sa_mask ) ); + sigaddset( &( act.sa_mask ), SIGPIPE ); act.sa_handler = SIG_DFL; act.sa_flags = 0; - sigaction(SIGPIPE, &act, 0L); + sigaction( SIGPIPE, &act, 0L ); // We set the close on exec flag. // Closing of fd[1] indicates that the execvp succeeded! - if (fd[1]) - fcntl(fd[1], F_SETFD, FD_CLOEXEC); - execvp(arglist[0], arglist); + if ( fd[ 1 ] ) + fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); + execvp( arglist[ 0 ], arglist ); char resultByte = 1; - if (fd[1]) - write(fd[1], &resultByte, 1); - _exit(-1); + if ( fd[ 1 ] ) + write( fd[ 1 ], &resultByte, 1 ); + _exit( -1 ); } - else if (-1 == pid_) + else if ( -1 == pid_ ) { // forking failed runs = false; - free(arglist); + free( arglist ); return false; } else { - if (fd[1]) - close(fd[1]); + if ( fd[ 1 ] ) + close( fd[ 1 ] ); // the parent continues here @@ -392,31 +370,32 @@ bool OProcess::start(RunMode runmode, Communication comm) // Check whether client could be started. - if (fd[0]) for(;;) + if ( fd[ 0 ] ) + for ( ;; ) { char resultByte; - int n = ::read(fd[0], &resultByte, 1); - if (n == 1) + int n = ::read( fd[ 0 ], &resultByte, 1 ); + if ( n == 1 ) { // Error runs = false; - close(fd[0]); - free(arglist); + close( fd[ 0 ] ); + free( arglist ); pid_ = 0; return false; } - if (n == -1) + if ( n == -1 ) { - if ((errno == ECHILD) || (errno == EINTR)) + if ( ( errno == ECHILD ) || ( errno == EINTR ) ) continue; // Ignore } break; // success } - if (fd[0]) - close(fd[0]); + if ( fd[ 0 ] ) + close( fd[ 0 ] ); - if (!commSetupDoneP()) // finish communication socket setup for the parent + if ( !commSetupDoneP() ) // finish communication socket setup for the parent qWarning( "Could not finish comm setup in parent!" ); - if (run_mode == Block) + if ( run_mode == Block ) { commClose(); @@ -424,14 +403,14 @@ bool OProcess::start(RunMode runmode, Communication comm) // The SIGCHLD handler of the process controller will catch // the exit and set the status - while(runs) + while ( runs ) { OProcessController::theOProcessController-> - slotDoHousekeeping(0); + slotDoHousekeeping( 0 ); } runs = FALSE; - emit processExited(this); + emit processExited( this ); } } - free(arglist); + free( arglist ); return true; } @@ -439,16 +418,14 @@ bool OProcess::start(RunMode runmode, Communication comm) -bool OProcess::kill(int signo) +bool OProcess::kill( int signo ) { - bool rv=false; + bool rv = false; - if (0 != pid_) - rv= (-1 != ::kill(pid_, signo)); + if ( 0 != pid_ ) + rv = ( -1 != ::kill( pid_, signo ) ); // probably store errno somewhere... return rv; } - - bool OProcess::isRunning() const { @@ -456,6 +433,4 @@ bool OProcess::isRunning() const } - - pid_t OProcess::pid() const { @@ -463,23 +438,17 @@ pid_t OProcess::pid() const } - - bool OProcess::normalExit() const { int _status = status; - return (pid_ != 0) && (!runs) && (WIFEXITED((_status))); + return ( pid_ != 0 ) && ( !runs ) && ( WIFEXITED( ( _status ) ) ); } - - int OProcess::exitStatus() const { int _status = status; - return WEXITSTATUS((_status)); + return WEXITSTATUS( ( _status ) ); } - - -bool OProcess::writeStdin(const char *buffer, int buflen) +bool OProcess::writeStdin( const char *buffer, int buflen ) { bool rv; @@ -488,14 +457,14 @@ bool OProcess::writeStdin(const char *buffer, int buflen) // to stdout is not allowed (since it could also confuse // kprocess... - if (0 != input_data) + if ( 0 != input_data ) return false; - if (runs && (communication & Stdin)) + if ( runs && ( communication & Stdin ) ) { input_data = buffer; input_sent = 0; input_total = buflen; - slotSendData(0); - innot->setEnabled(true); + slotSendData( 0 ); + innot->setEnabled( true ); rv = true; } @@ -507,6 +476,6 @@ bool OProcess::writeStdin(const char *buffer, int buflen) void OProcess::flushStdin ( ) { - if ( !input_data || ( input_sent == input_total )) - return; + if ( !input_data || ( input_sent == input_total ) ) + return ; int d1, d2; @@ -523,12 +492,12 @@ void OProcess::flushStdin ( ) void OProcess::suspend() { - if ((communication & Stdout) && outnot) - outnot->setEnabled(false); + if ( ( communication & Stdout ) && outnot ) + outnot->setEnabled( false ); } void OProcess::resume() { - if ((communication & Stdout) && outnot) - outnot->setEnabled(true); + if ( ( communication & Stdout ) && outnot ) + outnot->setEnabled( true ); } @@ -537,10 +506,10 @@ bool OProcess::closeStdin() bool rv; - if (communication & Stdin) + if ( communication & Stdin ) { - communication = (Communication) (communication & ~Stdin); + communication = ( Communication ) ( communication & ~Stdin ); delete innot; innot = 0; - close(in[1]); + close( in[ 1 ] ); rv = true; } @@ -554,10 +523,10 @@ bool OProcess::closeStdout() bool rv; - if (communication & Stdout) + if ( communication & Stdout ) { - communication = (Communication) (communication & ~Stdout); + communication = ( Communication ) ( communication & ~Stdout ); delete outnot; outnot = 0; - close(out[0]); + close( out[ 0 ] ); rv = true; } @@ -571,10 +540,10 @@ bool OProcess::closeStderr() bool rv; - if (communication & Stderr) + if ( communication & Stderr ) { - communication = static_cast<Communication>(communication & ~Stderr); + communication = static_cast<Communication>( communication & ~Stderr ); delete errnot; errnot = 0; - close(err[0]); + close( err[ 0 ] ); rv = true; } @@ -584,48 +553,31 @@ bool OProcess::closeStderr() } - -///////////////////////////// -// protected slots // -///////////////////////////// - - - -void OProcess::slotChildOutput(int fdno) +void OProcess::slotChildOutput( int fdno ) { - if (!childOutput(fdno)) + if ( !childOutput( fdno ) ) closeStdout(); } - -void OProcess::slotChildError(int fdno) +void OProcess::slotChildError( int fdno ) { - if (!childError(fdno)) + if ( !childError( fdno ) ) closeStderr(); } - -void OProcess::slotSendData(int) +void OProcess::slotSendData( int ) { - if (input_sent == input_total) + if ( input_sent == input_total ) { - innot->setEnabled(false); + innot->setEnabled( false ); input_data = 0; - emit wroteStdin(this); + emit wroteStdin( this ); } else - input_sent += ::write(in[1], input_data+input_sent, input_total-input_sent); + input_sent += ::write( in[ 1 ], input_data + input_sent, input_total - input_sent ); } - - -////////////////////////////// -// private member functions // -////////////////////////////// - - - -void OProcess::processHasExited(int state) +void OProcess::processHasExited( int state ) { - if (runs) + if ( runs ) { runs = false; @@ -635,19 +587,17 @@ void OProcess::processHasExited(int state) // also emit a signal if the process was run Blocking - if (DontCare != run_mode) + if ( DontCare != run_mode ) { - emit processExited(this); + emit processExited( this ); } } } - - -int OProcess::childOutput(int fdno) +int OProcess::childOutput( int fdno ) { - if (communication & NoRead) + if ( communication & NoRead ) { int len = -1; - emit receivedStdout(fdno, len); + emit receivedStdout( fdno, len ); errno = 0; // Make sure errno doesn't read "EAGAIN" return len; @@ -655,12 +605,12 @@ int OProcess::childOutput(int fdno) else { - char buffer[1024]; + char buffer[ 1024 ]; int len; - len = ::read(fdno, buffer, 1024); + len = ::read( fdno, buffer, 1024 ); - if ( 0 < len) + if ( 0 < len ) { - emit receivedStdout(this, buffer, len); + emit receivedStdout( this, buffer, len ); } return len; @@ -668,21 +618,17 @@ int OProcess::childOutput(int fdno) } - - -int OProcess::childError(int fdno) +int OProcess::childError( int fdno ) { - char buffer[1024]; + char buffer[ 1024 ]; int len; - len = ::read(fdno, buffer, 1024); + len = ::read( fdno, buffer, 1024 ); - if ( 0 < len) - emit receivedStderr(this, buffer, len); + if ( 0 < len ) + emit receivedStderr( this, buffer, len ); return len; } - - -int OProcess::setupCommunication(Communication comm) +int OProcess::setupCommunication( Communication comm ) { int ok; @@ -691,63 +637,62 @@ int OProcess::setupCommunication(Communication comm) ok = 1; - if (comm & Stdin) - ok &= socketpair(AF_UNIX, SOCK_STREAM, 0, in) >= 0; + if ( comm & Stdin ) + ok &= socketpair( AF_UNIX, SOCK_STREAM, 0, in ) >= 0; - if (comm & Stdout) - ok &= socketpair(AF_UNIX, SOCK_STREAM, 0, out) >= 0; + if ( comm & Stdout ) + ok &= socketpair( AF_UNIX, SOCK_STREAM, 0, out ) >= 0; - if (comm & Stderr) - ok &= socketpair(AF_UNIX, SOCK_STREAM, 0, err) >= 0; + if ( comm & Stderr ) + ok &= socketpair( AF_UNIX, SOCK_STREAM, 0, err ) >= 0; return ok; } - - int OProcess::commSetupDoneP() { int ok = 1; - if (communication != NoCommunication) + if ( communication != NoCommunication ) { - if (communication & Stdin) - close(in[0]); - if (communication & Stdout) - close(out[1]); - if (communication & Stderr) - close(err[1]); + if ( communication & Stdin ) + close( in[ 0 ] ); + if ( communication & Stdout ) + close( out[ 1 ] ); + if ( communication & Stderr ) + close( err[ 1 ] ); // Don't create socket notifiers and set the sockets non-blocking if // blocking is requested. - if (run_mode == Block) return ok; + if ( run_mode == Block ) + return ok; - if (communication & Stdin) + if ( communication & Stdin ) { // ok &= (-1 != fcntl(in[1], F_SETFL, O_NONBLOCK)); - innot = new QSocketNotifier(in[1], QSocketNotifier::Write, this); - CHECK_PTR(innot); - innot->setEnabled(false); // will be enabled when data has to be sent - QObject::connect(innot, SIGNAL(activated(int)), - this, SLOT(slotSendData(int))); + innot = new QSocketNotifier( in[ 1 ], QSocketNotifier::Write, this ); + CHECK_PTR( innot ); + innot->setEnabled( false ); // will be enabled when data has to be sent + QObject::connect( innot, SIGNAL( activated( int ) ), + this, SLOT( slotSendData( int ) ) ); } - if (communication & Stdout) + if ( communication & Stdout ) { // ok &= (-1 != fcntl(out[0], F_SETFL, O_NONBLOCK)); - outnot = new QSocketNotifier(out[0], QSocketNotifier::Read, this); - CHECK_PTR(outnot); - QObject::connect(outnot, SIGNAL(activated(int)), - this, SLOT(slotChildOutput(int))); - if (communication & NoRead) + outnot = new QSocketNotifier( out[ 0 ], QSocketNotifier::Read, this ); + CHECK_PTR( outnot ); + QObject::connect( outnot, SIGNAL( activated( int ) ), + this, SLOT( slotChildOutput( int ) ) ); + if ( communication & NoRead ) suspend(); } - if (communication & Stderr) + if ( communication & Stderr ) { // ok &= (-1 != fcntl(err[0], F_SETFL, O_NONBLOCK)); - errnot = new QSocketNotifier(err[0], QSocketNotifier::Read, this ); - CHECK_PTR(errnot); - QObject::connect(errnot, SIGNAL(activated(int)), - this, SLOT(slotChildError(int))); + errnot = new QSocketNotifier( err[ 0 ], QSocketNotifier::Read, this ); + CHECK_PTR( errnot ); + QObject::connect( errnot, SIGNAL( activated( int ) ), + this, SLOT( slotChildError( int ) ) ); } } @@ -755,21 +700,19 @@ int OProcess::commSetupDoneP() } - - int OProcess::commSetupDoneC() { int ok = 1; struct linger so; - memset(&so, 0, sizeof(so)); + memset( &so, 0, sizeof( so ) ); - if (communication & Stdin) - close(in[1]); - if (communication & Stdout) - close(out[0]); - if (communication & Stderr) - close(err[0]); + if ( communication & Stdin ) + close( in[ 1 ] ); + if ( communication & Stdout ) + close( out[ 0 ] ); + if ( communication & Stderr ) + close( err[ 0 ] ); - if (communication & Stdin) - ok &= dup2(in[0], STDIN_FILENO) != -1; + if ( communication & Stdin ) + ok &= dup2( in[ 0 ], STDIN_FILENO ) != -1; else { @@ -778,8 +721,8 @@ int OProcess::commSetupDoneC() close( null_fd ); } - if (communication & Stdout) + if ( communication & Stdout ) { - ok &= dup2(out[1], STDOUT_FILENO) != -1; - ok &= !setsockopt(out[1], SOL_SOCKET, SO_LINGER, (char*)&so, sizeof(so)); + ok &= dup2( out[ 1 ], STDOUT_FILENO ) != -1; + ok &= !setsockopt( out[ 1 ], SOL_SOCKET, SO_LINGER, ( char* ) & so, sizeof( so ) ); } else @@ -789,8 +732,8 @@ int OProcess::commSetupDoneC() close( null_fd ); } - if (communication & Stderr) + if ( communication & Stderr ) { - ok &= dup2(err[1], STDERR_FILENO) != -1; - ok &= !setsockopt(err[1], SOL_SOCKET, SO_LINGER, reinterpret_cast<char *>(&so), sizeof(so)); + ok &= dup2( err[ 1 ], STDERR_FILENO ) != -1; + ok &= !setsockopt( err[ 1 ], SOL_SOCKET, SO_LINGER, reinterpret_cast<char *>( &so ), sizeof( so ) ); } else @@ -803,17 +746,15 @@ int OProcess::commSetupDoneC() } - - void OProcess::commClose() { - if (NoCommunication != communication) + if ( NoCommunication != communication ) { - bool b_in = (communication & Stdin); - bool b_out = (communication & Stdout); - bool b_err = (communication & Stderr); - if (b_in) + bool b_in = ( communication & Stdin ); + bool b_out = ( communication & Stdout ); + bool b_err = ( communication & Stderr ); + if ( b_in ) delete innot; - if (b_out || b_err) + if ( b_out || b_err ) { // If both channels are being read we need to make sure that one socket buffer @@ -828,17 +769,17 @@ void OProcess::commClose() int max_fd = 0; - if (b_out) + if ( b_out ) { - fcntl(out[0], F_SETFL, O_NONBLOCK); - if (out[0] > max_fd) - max_fd = out[0]; + fcntl( out[ 0 ], F_SETFL, O_NONBLOCK ); + if ( out[ 0 ] > max_fd ) + max_fd = out[ 0 ]; delete outnot; outnot = 0; } - if (b_err) + if ( b_err ) { - fcntl(err[0], F_SETFL, O_NONBLOCK); - if (err[0] > max_fd) - max_fd = err[0]; + fcntl( err[ 0 ], F_SETFL, O_NONBLOCK ); + if ( err[ 0 ] > max_fd ) + max_fd = err[ 0 ]; delete errnot; errnot = 0; @@ -846,5 +787,5 @@ void OProcess::commClose() - while (b_out || b_err) + while ( b_out || b_err ) { // * If the process is still running we block until we @@ -858,27 +799,30 @@ void OProcess::commClose() struct timeval *p_timeout = runs ? 0 : &timeout; - FD_ZERO(&rfds); - if (b_out) - FD_SET(out[0], &rfds); + FD_ZERO( &rfds ); + if ( b_out ) + FD_SET( out[ 0 ], &rfds ); - if (b_err) - FD_SET(err[0], &rfds); + if ( b_err ) + FD_SET( err[ 0 ], &rfds ); - fds_ready = select(max_fd+1, &rfds, 0, 0, p_timeout); - if (fds_ready <= 0) break; + fds_ready = select( max_fd + 1, &rfds, 0, 0, p_timeout ); + if ( fds_ready <= 0 ) + break; - if (b_out && FD_ISSET(out[0], &rfds)) + if ( b_out && FD_ISSET( out[ 0 ], &rfds ) ) { int ret = 1; - while (ret > 0) ret = childOutput(out[0]); - if ((ret == -1 && errno != EAGAIN) || ret == 0) + while ( ret > 0 ) + ret = childOutput( out[ 0 ] ); + if ( ( ret == -1 && errno != EAGAIN ) || ret == 0 ) b_out = false; } - if (b_err && FD_ISSET(err[0], &rfds)) + if ( b_err && FD_ISSET( err[ 0 ], &rfds ) ) { int ret = 1; - while (ret > 0) ret = childError(err[0]); - if ((ret == -1 && errno != EAGAIN) || ret == 0) + while ( ret > 0 ) + ret = childError( err[ 0 ] ); + if ( ( ret == -1 && errno != EAGAIN ) || ret == 0 ) b_err = false; } @@ -886,39 +830,39 @@ void OProcess::commClose() } - if (b_in) + if ( b_in ) { - communication = (Communication) (communication & ~Stdin); - close(in[1]); + communication = ( Communication ) ( communication & ~Stdin ); + close( in[ 1 ] ); } - if (b_out) + if ( b_out ) { - communication = (Communication) (communication & ~Stdout); - close(out[0]); + communication = ( Communication ) ( communication & ~Stdout ); + close( out[ 0 ] ); } - if (b_err) + if ( b_err ) { - communication = (Communication) (communication & ~Stderr); - close(err[0]); + communication = ( Communication ) ( communication & ~Stderr ); + close( err[ 0 ] ); } } } -void OProcess::setUseShell(bool useShell, const char *shell) +void OProcess::setUseShell( bool useShell, const char *shell ) { - if (!d) + if ( !d ) d = new OProcessPrivate; d->useShell = useShell; d->shell = shell; - if (d->shell.isEmpty()) + if ( d->shell.isEmpty() ) d->shell = searchShell(); } -QString OProcess::quote(const QString &arg) +QString OProcess::quote( const QString &arg ) { QString res = arg; - res.replace(QRegExp(QString::fromLatin1("\'")), - QString::fromLatin1("'\"'\"'")); - res.prepend('\''); - res.append('\''); + res.replace( QRegExp( QString::fromLatin1( "\'" ) ), + QString::fromLatin1( "'\"'\"'" ) ); + res.prepend( '\'' ); + res.append( '\'' ); return res; } @@ -926,6 +870,6 @@ QString OProcess::quote(const QString &arg) QCString OProcess::searchShell() { - QCString tmpShell = QCString(getenv("SHELL")).stripWhiteSpace(); - if (!isExecutable(tmpShell)) + QCString tmpShell = QCString( getenv( "SHELL" ) ).stripWhiteSpace(); + if ( !isExecutable( tmpShell ) ) { tmpShell = "/bin/sh"; @@ -935,25 +879,27 @@ QCString OProcess::searchShell() } -bool OProcess::isExecutable(const QCString &filename) +bool OProcess::isExecutable( const QCString &filename ) { struct stat fileinfo; - if (filename.isEmpty()) return false; + if ( filename.isEmpty() ) + return false; // CC: we've got a valid filename, now let's see whether we can execute that file - if (-1 == stat(filename.data(), &fileinfo)) return false; + if ( -1 == stat( filename.data(), &fileinfo ) ) + return false; // CC: return false if the file does not exist // CC: anyway, we cannot execute directories, block/character devices, fifos or sockets - if ( (S_ISDIR(fileinfo.st_mode)) || - (S_ISCHR(fileinfo.st_mode)) || - (S_ISBLK(fileinfo.st_mode)) || + if ( ( S_ISDIR( fileinfo.st_mode ) ) || + ( S_ISCHR( fileinfo.st_mode ) ) || + ( S_ISBLK( fileinfo.st_mode ) ) || #ifdef S_ISSOCK // CC: SYSVR4 systems don't have that macro - (S_ISSOCK(fileinfo.st_mode)) || + ( S_ISSOCK( fileinfo.st_mode ) ) || #endif - (S_ISFIFO(fileinfo.st_mode)) || - (S_ISDIR(fileinfo.st_mode)) ) + ( S_ISFIFO( fileinfo.st_mode ) ) || + ( S_ISDIR( fileinfo.st_mode ) ) ) { return false; @@ -961,5 +907,6 @@ bool OProcess::isExecutable(const QCString &filename) // CC: now check for permission to execute the file - if (access(filename.data(), X_OK) != 0) return false; + if ( access( filename.data(), X_OK ) != 0 ) + return false; // CC: we've passed all the tests... @@ -967,4 +914,2 @@ bool OProcess::isExecutable(const QCString &filename) } - - diff --git a/libopie2/opiecore/oprocess.h b/libopie2/opiecore/oprocess.h index 8dd19b5..352485b 100644 --- a/libopie2/opiecore/oprocess.h +++ b/libopie2/opiecore/oprocess.h @@ -1,41 +1,45 @@ -/* This file is part of the KDE libraries - Copyright (C) 1997 Christian Czezakte (e9025461@student.tuwien.ac.at) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. +/* + This file is part of the Opie Project + Copyright (C) 2003-2004 Holger Freyther <zecke@handhelds.org> + Copyright (C) The Opie Team <opie-devel@handhelds.org> + =. Based on KProcess (C) 1997 Christian Czezatke (e9025461@student.tuwien.ac.at) + .=l. + .>+-= +_;:, .> :=|. This program is free software; you can +.> <`_, > . <= redistribute it and/or modify it under +:`=1 )Y*s>-.-- : the terms of the GNU Library General Public +.="- .-=="i, .._ License as published by the Free Software +- . .-<_> .<> Foundation; either version 2 of the License, + ._= =} : or (at your option) any later version. + .%`+i> _;_. + .i_,=:_. -<s. This program 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 +..}^=.= = ; Library General Public License for more +++= -. .` .: details. +: = ...= . :.=- +-. .:....=;==+<; You should have received a copy of the GNU + -_. . . )=. = Library General Public License along with + -- :-=` this library; see the file COPYING.LIB. + If not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -// -// KPROCESS -- A class for handling child processes in KDE without -// having to take care of Un*x specific implementation details -// -// version 0.3.1, Jan 8th 1998 -// -// (C) Christian Czezatke -// e9025461@student.tuwien.ac.at -// Ported by Holger Freyther to the Open Palmtop Integrated Environment -// - -#ifndef __kprocess_h__ -#define __kprocess_h__ +#ifndef OPROCESS_H +#define OPROCESS_H + +/* QT */ +#include <qcstring.h> +#include <qobject.h> +#include <qvaluelist.h> + +/* STD */ #include <sys/types.h> // for pid_t #include <sys/wait.h> #include <signal.h> #include <unistd.h> -#include <qvaluelist.h> -#include <qcstring.h> -#include <qobject.h> class QSocketNotifier; @@ -142,5 +146,5 @@ class OProcessPrivate; * *@author Christian Czezakte e9025461@student.tuwien.ac.at - * + *@author Holger Freyther (Opie Port) * **/ @@ -188,13 +192,13 @@ public: * Constructor */ - OProcess(QObject *parent = 0, const char *name = 0); + OProcess( QObject *parent = 0, const char *name = 0 ); /** * Constructor */ - OProcess(const QString &arg0, QObject *parent = 0, const char *name = 0); + OProcess( const QString &arg0, QObject *parent = 0, const char *name = 0 ); /** * Constructor */ - OProcess(const QStringList &args, QObject *parent = 0, const char *name = 0); + OProcess( const QStringList &args, QObject *parent = 0, const char *name = 0 ); /** @@ -221,5 +225,5 @@ public: */ - bool setExecutable(const QString& proc); + bool setExecutable( const QString& proc ); @@ -235,13 +239,13 @@ public: * **/ - OProcess &operator<<(const QString& arg); + OProcess &operator<<( const QString& arg ); /** * Similar to previous method, takes a char *, supposed to be in locale 8 bit already. */ - OProcess &operator<<(const char * arg); + OProcess &operator<<( const char * arg ); /** * Similar to previous method, takes a QCString, supposed to be in locale 8 bit already. */ - OProcess &operator<<(const QCString & arg); + OProcess &operator<<( const QCString & arg ); /** @@ -249,5 +253,5 @@ public: * in a single method call, or add a list of arguments. **/ - OProcess &operator<<(const QStringList& args); + OProcess &operator<<( const QStringList& args ); /** @@ -279,6 +283,6 @@ public: * (see above for error conditions) **/ - virtual bool start(RunMode runmode = NotifyOnExit, - Communication comm = NoCommunication); + virtual bool start( RunMode runmode = NotifyOnExit, + Communication comm = NoCommunication ); /** @@ -288,5 +292,5 @@ public: * @return @p true if the signal was delivered successfully. */ - virtual bool kill(int signo = SIGTERM); + virtual bool kill( int signo = SIGTERM ); /** @@ -334,5 +338,5 @@ public: * it does not have a valid exit status. */ - int exitStatus() const; + int exitStatus() const; @@ -361,5 +365,5 @@ public: * the child process is no longer alive... **/ - bool writeStdin(const char *buffer, int buflen); + bool writeStdin( const char *buffer, int buflen ); void flushStdin(); @@ -396,5 +400,8 @@ public: */ - const QValueList<QCString> &args() { return arguments; } + const QValueList<QCString> &args() + { + return arguments; + } /** @@ -404,5 +411,5 @@ public: * The default is @p false : drop privileges */ - void setRunPrivileged(bool keepPrivileges); + void setRunPrivileged( bool keepPrivileges ); /** @@ -416,5 +423,5 @@ public: * This function must be called before starting the process. */ - void setEnvironment(const QString &name, const QString &value); + void setEnvironment( const QString &name, const QString &value ); /** @@ -423,5 +430,5 @@ public: * This function must be called before starting the process. */ - void setWorkingDirectory(const QString &dir); + void setWorkingDirectory( const QString &dir ); /** @@ -436,5 +443,5 @@ public: * @see quote() */ - void setUseShell(bool useShell, const char *shell = 0); + void setUseShell( bool useShell, const char *shell = 0 ); /** @@ -444,5 +451,5 @@ public: * It also prevents expansion of wild cards and environment variables. */ - static QString quote(const QString &arg); + static QString quote( const QString &arg ); /** @@ -455,6 +462,4 @@ public: void detach(); - - signals: @@ -464,5 +469,5 @@ signals: * @ref start()) or the @ref Block mode. **/ - void processExited(OProcess *proc); + void processExited( OProcess *proc ); @@ -481,5 +486,5 @@ signals: * data structures before returning from this slot. **/ - void receivedStdout(OProcess *proc, char *buffer, int buflen); + void receivedStdout( OProcess *proc, char *buffer, int buflen ); /** @@ -498,5 +503,5 @@ signals: * The data still has to be read from file descriptor @p fd. **/ - void receivedStdout(int fd, int &len); + void receivedStdout( int fd, int &len ); @@ -514,5 +519,5 @@ signals: * data structures before returning from this slot. */ - void receivedStderr(OProcess *proc, char *buffer, int buflen); + void receivedStderr( OProcess *proc, char *buffer, int buflen ); /** @@ -521,6 +526,5 @@ signals: * written to the child process. **/ - void wroteStdin(OProcess *proc); - + void wroteStdin( OProcess *proc ); protected slots: @@ -530,5 +534,5 @@ protected slots: * It usually calls "childOutput" */ - void slotChildOutput(int fdno); + void slotChildOutput( int fdno ); /** @@ -536,5 +540,5 @@ protected slots: * It usually calls "childError" */ - void slotChildError(int fdno); + void slotChildError( int fdno ); /* Slot functions for capturing stdout and stderr of the child @@ -546,5 +550,5 @@ protected slots: * available, this function must disable the QSocketNotifier "innot". */ - void slotSendData(int dummy); + void slotSendData( int dummy ); protected: @@ -625,5 +629,5 @@ protected: * network communication, for example. */ - virtual int setupCommunication(Communication comm); + virtual int setupCommunication( Communication comm ); /** @@ -655,5 +659,5 @@ protected: * not running in the "DontCare" mode). */ - virtual void processHasExited(int state); + virtual void processHasExited( int state ); /** @@ -667,7 +671,7 @@ protected: * the socket descriptors for stdin/stdout/stderr. */ - int out[2]; - int in[2]; - int err[2]; + int out[ 2 ]; + int in[ 2 ]; + int err[ 2 ]; /** @@ -689,5 +693,5 @@ protected: * "@ref receivedStderr". */ - int childOutput(int fdno); + int childOutput( int fdno ); /** @@ -696,5 +700,5 @@ protected: * "@ref receivedStderr" */ - int childError(int fdno); + int childError( int fdno ); // information about the data that has to be sent to the child: @@ -710,5 +714,4 @@ protected: friend class OProcessController; - private: /** @@ -730,5 +733,5 @@ private: * is actually executable at all. */ - bool isExecutable(const QCString &filename); + bool isExecutable( const QCString &filename ); // Disallow assignment and copy-construction @@ -738,10 +741,7 @@ private: private: void init ( ); - OProcessPrivate *d; }; - - #endif |