summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-01-13 19:20:49 (UTC)
committer mickeyl <mickeyl>2004-01-13 19:20:49 (UTC)
commit81b48fa5be4806e3afa64a0d1fa254fbdf9b7315 (patch) (side-by-side diff)
treea28289a6d048ec80e359233a6b72bd946a9b8eb8
parent399cf645e63e53043975fa2b26768d8db6d83ee4 (diff)
downloadopie-81b48fa5be4806e3afa64a0d1fa254fbdf9b7315.zip
opie-81b48fa5be4806e3afa64a0d1fa254fbdf9b7315.tar.gz
opie-81b48fa5be4806e3afa64a0d1fa254fbdf9b7315.tar.bz2
cleanup and unify source layout
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oprocess.cpp689
-rw-r--r--libopie2/opiecore/oprocess.h152
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,65 +1,48 @@
/*
-
- $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>
@@ -68,2 +51,6 @@
#include <string.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
#include <unistd.h>
@@ -75,11 +62,2 @@
#endif
-#include <pwd.h>
-
-#include <qapplication.h>
-#include <qmap.h>
-//#include <kdebug.h>
-
-/////////////////////////////
-// public member functions //
-/////////////////////////////
@@ -88,6 +66,7 @@ class OProcessPrivate
public:
- OProcessPrivate() : useShell(false) { }
+ OProcessPrivate() : useShell( false )
+ { }
bool useShell;
- QMap<QString,QString> env;
+ QMap<QString, QString> env;
QString wd;
@@ -97,4 +76,4 @@ public:
-OProcess::OProcess(QObject *parent, const char *name)
- : QObject(parent, name)
+OProcess::OProcess( QObject *parent, const char *name )
+ : QObject( parent, name )
{
@@ -103,4 +82,4 @@ OProcess::OProcess(QObject *parent, const char *name)
-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 )
{
@@ -110,4 +89,4 @@ 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 )
{
@@ -133,26 +112,24 @@ void OProcess::init ( )
- 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;
@@ -161,13 +138,12 @@ OProcess::setWorkingDirectory(const QString &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() );
}
@@ -175,4 +151,3 @@ OProcess::setupEnvironment()
-void
-OProcess::setRunPrivileged(bool keepPrivileges)
+void OProcess::setRunPrivileged( bool keepPrivileges )
{
@@ -181,4 +156,3 @@ OProcess::setRunPrivileged(bool keepPrivileges)
-bool
-OProcess::runPrivileged() const
+bool OProcess::runPrivileged() const
{
@@ -187,3 +161,2 @@ OProcess::runPrivileged() const
-
OProcess::~OProcess()
@@ -195,3 +168,3 @@ OProcess::~OProcess()
- OProcessController::theOProcessController->removeOProcess(this);
+ OProcessController::theOProcessController->removeOProcess( this );
// this must happen before we kill the child
@@ -199,4 +172,4 @@ OProcess::~OProcess()
- if (runs && (run_mode != DontCare))
- kill(SIGKILL);
+ if ( runs && ( run_mode != DontCare ) )
+ kill( SIGKILL );
@@ -213,3 +186,3 @@ void OProcess::detach()
{
- OProcessController::theOProcessController->removeOProcess(this);
+ OProcessController::theOProcessController->removeOProcess( this );
@@ -224,11 +197,13 @@ 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 ) );
@@ -237,3 +212,3 @@ bool OProcess::setExecutable(const QString& proc)
-OProcess &OProcess::operator<<(const QStringList& args)
+OProcess &OProcess::operator<<( const QStringList& args )
{
@@ -241,3 +216,3 @@ OProcess &OProcess::operator<<(const QStringList& args)
for ( ; it != args.end() ; ++it )
- arguments.append(QFile::encodeName(*it));
+ arguments.append( QFile::encodeName( *it ) );
return *this;
@@ -245,10 +220,10 @@ OProcess &OProcess::operator<<(const QStringList& args)
-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;
@@ -256,5 +231,5 @@ OProcess &OProcess::operator<<(const char* arg)
-OProcess &OProcess::operator<<(const QString& arg)
+OProcess &OProcess::operator<<( const QString& arg )
{
- arguments.append(QFile::encodeName(arg));
+ arguments.append( QFile::encodeName( arg ) );
return *this;
@@ -267,3 +242,3 @@ void OProcess::clearArguments()
-bool OProcess::start(RunMode runmode, Communication comm)
+bool OProcess::start( RunMode runmode, Communication comm )
{
@@ -273,3 +248,3 @@ bool OProcess::start(RunMode runmode, Communication comm)
- if (runs || (0 == n))
+ if ( runs || ( 0 == n ) )
{
@@ -282,5 +257,5 @@ 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() )
{
@@ -290,6 +265,6 @@ 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
@@ -297,6 +272,6 @@ bool OProcess::start(RunMode runmode, Communication comm)
- 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;
}
@@ -304,10 +279,10 @@ bool OProcess::start(RunMode runmode, Communication comm)
{
- 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!" );
@@ -318,9 +293,10 @@ bool OProcess::start(RunMode runmode, Communication comm)
#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
}
@@ -335,17 +311,19 @@ bool OProcess::start(RunMode runmode, Communication comm)
- 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!" );
@@ -355,11 +333,11 @@ 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 );
@@ -367,11 +345,11 @@ bool OProcess::start(RunMode runmode, Communication comm)
// 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_ )
{
@@ -380,3 +358,3 @@ bool OProcess::start(RunMode runmode, Communication comm)
runs = false;
- free(arglist);
+ free( arglist );
return false;
@@ -385,4 +363,4 @@ bool OProcess::start(RunMode runmode, Communication comm)
{
- if (fd[1])
- close(fd[1]);
+ if ( fd[ 1 ] )
+ close( fd[ 1 ] );
// the parent continues here
@@ -393,7 +371,8 @@ 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 )
{
@@ -401,4 +380,4 @@ bool OProcess::start(RunMode runmode, Communication comm)
runs = false;
- close(fd[0]);
- free(arglist);
+ close( fd[ 0 ] );
+ free( arglist );
pid_ = 0;
@@ -406,5 +385,5 @@ bool OProcess::start(RunMode runmode, Communication comm)
}
- if (n == -1)
+ if ( n == -1 )
{
- if ((errno == ECHILD) || (errno == EINTR))
+ if ( ( errno == ECHILD ) || ( errno == EINTR ) )
continue; // Ignore
@@ -413,9 +392,9 @@ bool OProcess::start(RunMode runmode, Communication comm)
}
- 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 )
{
@@ -425,12 +404,12 @@ bool OProcess::start(RunMode runmode, Communication comm)
// 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;
@@ -440,8 +419,8 @@ 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...
@@ -450,4 +429,2 @@ bool OProcess::kill(int signo)
-
-
bool OProcess::isRunning() const
@@ -457,4 +434,2 @@ bool OProcess::isRunning() const
-
-
pid_t OProcess::pid() const
@@ -464,4 +439,2 @@ pid_t OProcess::pid() const
-
-
bool OProcess::normalExit() const
@@ -469,7 +442,5 @@ bool OProcess::normalExit() const
int _status = status;
- return (pid_ != 0) && (!runs) && (WIFEXITED((_status)));
+ return ( pid_ != 0 ) && ( !runs ) && ( WIFEXITED( ( _status ) ) );
}
-
-
int OProcess::exitStatus() const
@@ -477,8 +448,6 @@ 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 )
{
@@ -489,6 +458,6 @@ bool OProcess::writeStdin(const char *buffer, int buflen)
// kprocess...
- if (0 != input_data)
+ if ( 0 != input_data )
return false;
- if (runs && (communication & Stdin))
+ if ( runs && ( communication & Stdin ) )
{
@@ -497,4 +466,4 @@ bool OProcess::writeStdin(const char *buffer, int buflen)
input_total = buflen;
- slotSendData(0);
- innot->setEnabled(true);
+ slotSendData( 0 );
+ innot->setEnabled( true );
rv = true;
@@ -508,4 +477,4 @@ void OProcess::flushStdin ( )
{
- if ( !input_data || ( input_sent == input_total ))
- return;
+ if ( !input_data || ( input_sent == input_total ) )
+ return ;
@@ -524,4 +493,4 @@ void OProcess::suspend()
{
- if ((communication & Stdout) && outnot)
- outnot->setEnabled(false);
+ if ( ( communication & Stdout ) && outnot )
+ outnot->setEnabled( false );
}
@@ -530,4 +499,4 @@ void OProcess::resume()
{
- if ((communication & Stdout) && outnot)
- outnot->setEnabled(true);
+ if ( ( communication & Stdout ) && outnot )
+ outnot->setEnabled( true );
}
@@ -538,8 +507,8 @@ bool OProcess::closeStdin()
- 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;
@@ -555,8 +524,8 @@ bool OProcess::closeStdout()
- 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;
@@ -572,8 +541,8 @@ bool OProcess::closeStderr()
- 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;
@@ -585,12 +554,5 @@ bool OProcess::closeStderr()
-
-/////////////////////////////
-// protected slots //
-/////////////////////////////
-
-
-
-void OProcess::slotChildOutput(int fdno)
+void OProcess::slotChildOutput( int fdno )
{
- if (!childOutput(fdno))
+ if ( !childOutput( fdno ) )
closeStdout();
@@ -598,6 +560,5 @@ void OProcess::slotChildOutput(int fdno)
-
-void OProcess::slotChildError(int fdno)
+void OProcess::slotChildError( int fdno )
{
- if (!childError(fdno))
+ if ( !childError( fdno ) )
closeStderr();
@@ -605,26 +566,17 @@ void OProcess::slotChildError(int fdno)
-
-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 )
{
@@ -636,5 +588,5 @@ 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 );
}
@@ -643,10 +595,8 @@ void OProcess::processHasExited(int state)
-
-
-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"
@@ -656,10 +606,10 @@ int OProcess::childOutput(int fdno)
{
- 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 );
}
@@ -669,13 +619,11 @@ 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;
@@ -683,5 +631,3 @@ int OProcess::childError(int fdno)
-
-
-int OProcess::setupCommunication(Communication comm)
+int OProcess::setupCommunication( Communication comm )
{
@@ -692,10 +638,10 @@ 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;
@@ -704,4 +650,2 @@ int OProcess::setupCommunication(Communication comm)
-
-
int OProcess::commSetupDoneP()
@@ -710,10 +654,10 @@ int OProcess::commSetupDoneP()
- 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 ] );
@@ -721,22 +665,23 @@ int OProcess::commSetupDoneP()
// 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();
@@ -744,9 +689,9 @@ int OProcess::commSetupDoneP()
- 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 ) ) );
}
@@ -756,4 +701,2 @@ int OProcess::commSetupDoneP()
-
-
int OProcess::commSetupDoneC()
@@ -762,13 +705,13 @@ int OProcess::commSetupDoneC()
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
@@ -779,6 +722,6 @@ int OProcess::commSetupDoneC()
}
- 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 ) );
}
@@ -790,6 +733,6 @@ int OProcess::commSetupDoneC()
}
- 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 ) );
}
@@ -804,15 +747,13 @@ 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 )
{
@@ -829,7 +770,7 @@ 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;
@@ -837,7 +778,7 @@ void OProcess::commClose()
}
- 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;
@@ -847,3 +788,3 @@ void OProcess::commClose()
- while (b_out || b_err)
+ while ( b_out || b_err )
{
@@ -859,17 +800,19 @@ void OProcess::commClose()
- 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;
@@ -877,7 +820,8 @@ void OProcess::commClose()
- 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;
@@ -887,16 +831,16 @@ 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 ] );
}
@@ -905,5 +849,5 @@ void OProcess::commClose()
-void OProcess::setUseShell(bool useShell, const char *shell)
+void OProcess::setUseShell( bool useShell, const char *shell )
{
- if (!d)
+ if ( !d )
d = new OProcessPrivate;
@@ -911,3 +855,3 @@ void OProcess::setUseShell(bool useShell, const char *shell)
d->shell = shell;
- if (d->shell.isEmpty())
+ if ( d->shell.isEmpty() )
d->shell = searchShell();
@@ -915,9 +859,9 @@ void OProcess::setUseShell(bool useShell, const char *shell)
-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;
@@ -927,4 +871,4 @@ QCString OProcess::searchShell()
{
- QCString tmpShell = QCString(getenv("SHELL")).stripWhiteSpace();
- if (!isExecutable(tmpShell))
+ QCString tmpShell = QCString( getenv( "SHELL" ) ).stripWhiteSpace();
+ if ( !isExecutable( tmpShell ) )
{
@@ -936,3 +880,3 @@ QCString OProcess::searchShell()
-bool OProcess::isExecutable(const QCString &filename)
+bool OProcess::isExecutable( const QCString &filename )
{
@@ -940,3 +884,4 @@ bool OProcess::isExecutable(const QCString &filename)
- if (filename.isEmpty()) return false;
+ if ( filename.isEmpty() )
+ return false;
@@ -944,3 +889,4 @@ bool OProcess::isExecutable(const QCString &filename)
- 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
@@ -948,11 +894,11 @@ bool OProcess::isExecutable(const QCString &filename)
// 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 ) ) )
{
@@ -962,3 +908,4 @@ 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;
@@ -968,3 +915 @@ 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,33 +1,40 @@
-/* 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
@@ -36,5 +43,2 @@
#include <unistd.h>
-#include <qvaluelist.h>
-#include <qcstring.h>
-#include <qobject.h>
@@ -143,3 +147,3 @@ class OProcessPrivate;
*@author Christian Czezakte e9025461@student.tuwien.ac.at
- *
+ *@author Holger Freyther (Opie Port)
*
@@ -189,3 +193,3 @@ public:
*/
- OProcess(QObject *parent = 0, const char *name = 0);
+ OProcess( QObject *parent = 0, const char *name = 0 );
/**
@@ -193,3 +197,3 @@ public:
*/
- OProcess(const QString &arg0, QObject *parent = 0, const char *name = 0);
+ OProcess( const QString &arg0, QObject *parent = 0, const char *name = 0 );
/**
@@ -197,3 +201,3 @@ public:
*/
- OProcess(const QStringList &args, QObject *parent = 0, const char *name = 0);
+ OProcess( const QStringList &args, QObject *parent = 0, const char *name = 0 );
@@ -222,3 +226,3 @@ public:
*/
- bool setExecutable(const QString& proc);
+ bool setExecutable( const QString& proc );
@@ -236,3 +240,3 @@ public:
**/
- OProcess &operator<<(const QString& arg);
+ OProcess &operator<<( const QString& arg );
/**
@@ -240,3 +244,3 @@ public:
*/
- OProcess &operator<<(const char * arg);
+ OProcess &operator<<( const char * arg );
/**
@@ -244,3 +248,3 @@ public:
*/
- OProcess &operator<<(const QCString & arg);
+ OProcess &operator<<( const QCString & arg );
@@ -250,3 +254,3 @@ public:
**/
- OProcess &operator<<(const QStringList& args);
+ OProcess &operator<<( const QStringList& args );
@@ -280,4 +284,4 @@ public:
**/
- virtual bool start(RunMode runmode = NotifyOnExit,
- Communication comm = NoCommunication);
+ virtual bool start( RunMode runmode = NotifyOnExit,
+ Communication comm = NoCommunication );
@@ -289,3 +293,3 @@ public:
*/
- virtual bool kill(int signo = SIGTERM);
+ virtual bool kill( int signo = SIGTERM );
@@ -335,3 +339,3 @@ public:
*/
- int exitStatus() const;
+ int exitStatus() const;
@@ -362,3 +366,3 @@ public:
**/
- bool writeStdin(const char *buffer, int buflen);
+ bool writeStdin( const char *buffer, int buflen );
@@ -397,3 +401,6 @@ public:
- const QValueList<QCString> &args() { return arguments; }
+ const QValueList<QCString> &args()
+ {
+ return arguments;
+ }
@@ -405,3 +412,3 @@ public:
*/
- void setRunPrivileged(bool keepPrivileges);
+ void setRunPrivileged( bool keepPrivileges );
@@ -417,3 +424,3 @@ public:
*/
- void setEnvironment(const QString &name, const QString &value);
+ void setEnvironment( const QString &name, const QString &value );
@@ -424,3 +431,3 @@ public:
*/
- void setWorkingDirectory(const QString &dir);
+ void setWorkingDirectory( const QString &dir );
@@ -437,3 +444,3 @@ public:
*/
- void setUseShell(bool useShell, const char *shell = 0);
+ void setUseShell( bool useShell, const char *shell = 0 );
@@ -445,3 +452,3 @@ public:
*/
- static QString quote(const QString &arg);
+ static QString quote( const QString &arg );
@@ -456,4 +463,2 @@ public:
-
-
signals:
@@ -465,3 +470,3 @@ signals:
**/
- void processExited(OProcess *proc);
+ void processExited( OProcess *proc );
@@ -482,3 +487,3 @@ signals:
**/
- void receivedStdout(OProcess *proc, char *buffer, int buflen);
+ void receivedStdout( OProcess *proc, char *buffer, int buflen );
@@ -499,3 +504,3 @@ signals:
**/
- void receivedStdout(int fd, int &len);
+ void receivedStdout( int fd, int &len );
@@ -515,3 +520,3 @@ signals:
*/
- void receivedStderr(OProcess *proc, char *buffer, int buflen);
+ void receivedStderr( OProcess *proc, char *buffer, int buflen );
@@ -522,4 +527,3 @@ signals:
**/
- void wroteStdin(OProcess *proc);
-
+ void wroteStdin( OProcess *proc );
@@ -531,3 +535,3 @@ protected slots:
*/
- void slotChildOutput(int fdno);
+ void slotChildOutput( int fdno );
@@ -537,3 +541,3 @@ protected slots:
*/
- void slotChildError(int fdno);
+ void slotChildError( int fdno );
/*
@@ -547,3 +551,3 @@ protected slots:
*/
- void slotSendData(int dummy);
+ void slotSendData( int dummy );
@@ -626,3 +630,3 @@ protected:
*/
- virtual int setupCommunication(Communication comm);
+ virtual int setupCommunication( Communication comm );
@@ -656,3 +660,3 @@ protected:
*/
- virtual void processHasExited(int state);
+ virtual void processHasExited( int state );
@@ -668,5 +672,5 @@ protected:
*/
- int out[2];
- int in[2];
- int err[2];
+ int out[ 2 ];
+ int in[ 2 ];
+ int err[ 2 ];
@@ -690,3 +694,3 @@ protected:
*/
- int childOutput(int fdno);
+ int childOutput( int fdno );
@@ -697,3 +701,3 @@ protected:
*/
- int childError(int fdno);
+ int childError( int fdno );
@@ -711,3 +715,2 @@ protected:
-
private:
@@ -731,3 +734,3 @@ private:
*/
- bool isExecutable(const QCString &filename);
+ bool isExecutable( const QCString &filename );
@@ -739,3 +742,2 @@ private:
void init ( );
-
OProcessPrivate *d;
@@ -743,4 +745,2 @@ private:
-
-
#endif