| -rw-r--r-- | libopie2/opiecore/linux/linux.pro | 2 | ||||
| -rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/linux.pro b/libopie2/opiecore/linux/linux.pro index c0c4f7f..d2e36ae 100644 --- a/libopie2/opiecore/linux/linux.pro +++ b/libopie2/opiecore/linux/linux.pro @@ -1,11 +1,11 @@ HEADERS += \ linux/ofilenotify.h \ linux/oinputsystem.h \ linux/opcmciasystem.h SOURCES += \ linux/ofilenotify.cpp \ linux/oinputsystem.cpp \ linux/opcmciasystem.cpp -DEFINES += OPCMCIA_DEBUG=1 +# DEFINES += OPCMCIA_DEBUG=1 diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 445d903..2b0c01d 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp @@ -193,36 +193,38 @@ OPcmciaSocket::~OPcmciaSocket() { dev_t dev = makedev( _major, _socket ); #ifdef OPCMCIA_DEBUG QString filename = "/tmp/opcmciasystem-debug"; if ( QFile::exists( filename ) ) #else QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() ); if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 ) #endif { _fd = ::open( (const char*) filename, O_RDONLY); if ( !_fd ) { qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) ); } +#ifndef OPCMCIA_DEBUG else { ::unlink( (const char*) filename ); } +#endif } else { qWarning( "OPcmciaSocket::init() - can't create device node '%s' (%s)", (const char*) filename, strerror( errno ) ); } } } /* internal */ void OPcmciaSocket::cleanup() { // close control socket } /* internal */ bool OPcmciaSocket::getTuple( cisdata_t tuple ) const { _ioctlarg.tuple.DesiredTuple = tuple; |