| author | zecke <zecke> | 2005-03-02 19:42:04 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2005-03-02 19:42:04 (UTC) |
| commit | a349b5d092c392aba28c6fbd99221559c33bc5e1 (patch) (side-by-side diff) | |
| tree | 56a809f42d20c6f2fe7a60f243dd1aebca359b39 /core/launcher | |
| parent | 9f3e0913c7b01c1e14f907e756999b9d9bf9ceef (diff) | |
| download | opie-a349b5d092c392aba28c6fbd99221559c33bc5e1.zip opie-a349b5d092c392aba28c6fbd99221559c33bc5e1.tar.gz opie-a349b5d092c392aba28c6fbd99221559c33bc5e1.tar.bz2 | |
Close the Filedescriptor for the QCopBridge and Transferserver on exit
| -rw-r--r-- | core/launcher/qcopbridge.cpp | 4 | ||||
| -rw-r--r-- | core/launcher/transferserver.cpp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp index e339dc7..64eb096 100644 --- a/core/launcher/qcopbridge.cpp +++ b/core/launcher/qcopbridge.cpp @@ -44,8 +44,9 @@ using namespace Opie::Core; #endif #ifndef Q_OS_WIN32 #include <pwd.h> #include <unistd.h> +#include <fcntl.h> #include <sys/types.h> #endif #if defined(_OS_LINUX_) @@ -60,10 +61,11 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent, desktopChannel( 0 ), cardChannel( 0 ) { if ( !ok() ) - owarn << "Failed to bind to port " << port << "" << oendl; + owarn << "Failed to bind to port " << port << "" << oendl; else { + ::fcntl( socket(), F_SETFD, FD_CLOEXEC ); #ifndef QT_NO_COP desktopChannel = new QCopChannel( "QPE/Desktop", this ); connect( desktopChannel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(desktopMessage(const QCString&,const QByteArray&)) ); diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index 2b2e435..a219c0f 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp @@ -38,8 +38,9 @@ using namespace Opie::Core; /* STD */ #include <pwd.h> #include <sys/types.h> #include <unistd.h> +#include <fcntl.h> #include <stdlib.h> #include <time.h> #ifndef Q_OS_MACX @@ -54,9 +55,11 @@ TransferServer::TransferServer( Q_UINT16 port, QObject *parent, : QServerSocket( port, 1, parent, name ) { connections.setAutoDelete( TRUE ); if ( !ok() ) - owarn << "Failed to bind to port " << port << "" << oendl; + owarn << "Failed to bind to port " << port << "" << oendl; + else + ::fcntl( socket(), F_SETFD, FD_CLOEXEC ); } void TransferServer::authorizeConnections() { |