- add the static method int OProcess::processPID(const QString&)

- add an example program for dealing with OProcess. This should be enhanced...

6 files changed, 65 insertions, 1 deletions

diff --git a/libopie2/examples/opiecore/opiecore.pro b/libopie2/examples/opiecore/opiecore.pro
index 8f3aedc..ec14be0 100644
--- a/libopie2/examples/opiecore/opiecore.pro
+++ b/libopie2/examples/opiecore/opiecore.pro
@@ -1,3 +1,3 @@
 TEMPLATE        = subdirs
-unix:SUBDIRS    = odebugdemo oconfigdemo oglobalsettingsdemo
+unix:SUBDIRS    = odebugdemo oconfigdemo oglobalsettingsdemo oprocessdemo
 
diff --git a/libopie2/examples/opiecore/oprocessdemo/.cvsignore b/libopie2/examples/opiecore/oprocessdemo/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/libopie2/examples/opiecore/oprocessdemo/.cvsignore
@@ -0,0 +1,6 @@
+Makefile*
+moc*
+*moc
+*.o
+~*
+
diff --git a/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.cpp b/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.cpp
new file mode 100644
index 0000000..0abf53e
--- a/dev/null
+++ b/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.cpp
@@ -0,0 +1,11 @@
+#include <opie2/oprocess.h>
+#include <iostream.h>
+
+int main( int argc, char** argv )
+{
+    printf( "my own PID seems to be '%d'\n", OProcess::processPID( "oprocessdemo" ) );
+    printf( "the PID of process 'Mickey' seems to be '%d'\n\n", OProcess::processPID( "Mickey" ) );
+
+    return 0;
+}
+
diff --git a/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.pro b/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.pro
new file mode 100644
index 0000000..72dac7f
--- a/dev/null
+++ b/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.pro
@@ -0,0 +1,12 @@
+TEMPLATE        = app
+CONFIG          = qt warn_on debug
+HEADERS         =
+SOURCES         = oprocessdemo.cpp
+INCLUDEPATH     += $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
+LIBS            += -lopiecore2
+TARGET          = oprocessdemo
+
+include ( $(OPIEDIR)/include.pro )
+
+
diff --git a/libopie2/opiecore/oprocess.cpp b/libopie2/opiecore/oprocess.cpp
index f1a5f3b..5cfcf32 100644
--- a/libopie2/opiecore/oprocess.cpp
+++ b/libopie2/opiecore/oprocess.cpp
@@ -23,36 +23,38 @@ _;:,     .>    :=|.         This program is free software; you can
 -.   .:....=;==+<;          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.
 */
 
 #include "oprocctrl.h"
 
 /* OPIE */
 #include <opie2/oprocess.h>
 
 /* QT */
 
 #include <qapplication.h>
+#include <qdir.h>
 #include <qfile.h>
 #include <qmap.h>
 #include <qregexp.h>
 #include <qsocketnotifier.h>
+#include <qtextstream.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
 #include <sys/select.h>
@@ -900,16 +902,44 @@ bool OProcess::isExecutable( const QCString &filename )
             ( S_ISSOCK( fileinfo.st_mode ) ) ||
 #endif
             ( S_ISFIFO( fileinfo.st_mode ) ) ||
             ( S_ISDIR( fileinfo.st_mode ) ) )
     {
         return false;
     }
 
     // CC: now check for permission to execute the file
     if ( access( filename.data(), X_OK ) != 0 )
         return false;
 
     // CC: we've passed all the tests...
     return true;
 }
 
+int OProcess::processPID( const QString& process )
+{
+    QString line;
+    QDir d = QDir( "/proc" );
+    QStringList dirs = d.entryList( QDir::Dirs );
+    QStringList::Iterator it;
+    for ( it = dirs.begin(); it != dirs.end(); ++it )
+    {
+        //qDebug( "next entry: %s", (const char*) *it );
+        QFile file( "/proc/"+*it+"/cmdline" );
+        file.open( IO_ReadOnly );
+        if ( !file.isOpen() ) continue;
+        QTextStream t( &file );
+        line = t.readLine();
+        //qDebug( "cmdline = %s", (const char*) line );
+        if ( line.contains( process ) ) break; //FIXME: That may find also other process, if the name is not long enough ;)
+    }
+    if ( line.contains( process ) )
+    {
+        //qDebug( "found process id #%d", (*it).toInt() );
+        return (*it).toInt();
+    }
+    else
+    {
+        //qDebug( "process '%s' not found", (const char*) process );
+        return -1;
+    }
+}
diff --git a/libopie2/opiecore/oprocess.h b/libopie2/opiecore/oprocess.h
index 352485b..1a2472d 100644
--- a/libopie2/opiecore/oprocess.h
+++ b/libopie2/opiecore/oprocess.h
@@ -448,32 +448,37 @@ public:
      * This function can be used to quote an argument string such that
      * the shell processes it properly. This is e. g. necessary for
      * user-provided file names which may contain spaces or quotes.
      * It also prevents expansion of wild cards and environment variables.
      */
     static QString quote( const QString &arg );
 
     /**
      * Detaches OProcess from child process. All communication is closed.
      * No exit notification is emitted any more for the child process.
      * Deleting the OProcess will no longer kill the child process.
      * Note that the current process remains the parent process of the
      * child process.
      */
     void detach();
 
+    /**
+     * @return the PID of @a process, or -1 if the process is not running
+     */
+    static int processPID( const QString& process );
+
 signals:
 
     /**
      * Emitted after the process has terminated when
      * the process was run in the @p NotifyOnExit  (==default option to
      * @ref start()) or the @ref Block mode.
      **/
     void processExited( OProcess *proc );
 
 
     /**
      * Emitted, when output from the child process has
      * been received on stdout.
      *
      *  To actually get
      * these signals, the respective communication link (stdout/stderr)