Remove the libuuid dependency for Linux targets...

3 files changed, 49 insertions, 14 deletions

diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index bae5c51..5b32bc3 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -100,5 +100,5 @@ INCLUDEPATH += ../../rsync
 DEPENDPATH	+= ../../rsync
 TARGET		= qpe
-LIBS		+= -lqpe -lcrypt -lopie -luuid
+LIBS		+= -lqpe -lcrypt -lopie 
 
 TRANSLATIONS = ../../i18n/de/qpe.ts \
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index ce73d8b..e9338fb 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -5,5 +5,5 @@ Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
-Depends: qt-embedded (>=$QTE_VERSION), libuuid1
+Depends: qt-embedded (>=$QTE_VERSION)
 Description: Launcher for Opie
  The "finder" or "explorer", or whatever you want to call it.
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index 9d18b7b..a20df2f 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -26,4 +26,6 @@
 #include <shadow.h>
 
+#ifndef  _OS_LINUX_
+
 extern "C" {
 #include <uuid/uuid.h>
@@ -31,4 +33,6 @@ extern "C" {
 }
 
+#endif // not defined linux
+
 #if defined(_OS_LINUX_)
 #include <shadow.h>
@@ -77,4 +81,35 @@ void TransferServer::newConnection( int socket )
 }
 
+/*
+ * small class in anonymous namespace
+ * to generate a QUUid for us
+ */
+namespace {
+    struct UidGen {
+        QString uuid();
+    };
+#if defined(_OS_LINUX_)
+    /*
+     * linux got a /proc/sys/kernel/random/uuid file
+     * it'll generate the uuids for us
+     */
+    QString UidGen::uuid() {
+        QFile file( "/proc/sys/kernel/random/uuid" );
+        if (!file.open(IO_ReadOnly ) )
+            return QString::null;
+
+        QTextStream stream(&file);
+
+        return "{" + stream.read().stripWhiteSpace() + "}";
+    }
+#else
+    QString UidGen::uuid() {
+        uuid_t uuid;
+        uuid_generate( uuid );
+        return QUUid( uuid ).toString();
+    }
+#endif
+}
+
 QString SyncAuthentication::serverId()
 {
@@ -83,7 +118,7 @@ QString SyncAuthentication::serverId()
     QString r=cfg.readEntry("serverid");
     if ( r.isEmpty() ) {
-  uuid_t uuid;
-  uuid_generate( uuid );
-  cfg.writeEntry("serverid",(r = QUuid( uuid ).toString()));
+        UidGen gen;
+        r = gen.uuid();
+        cfg.writeEntry("serverid", r );
     }
     return r;
@@ -116,5 +151,5 @@ int SyncAuthentication::isAuthorized(QHostAddress peeraddress)
 //    QString allowedstr = cfg.readEntry("auth_peer","192.168.1.0");
      uint auth_peer = cfg.readNumEntry("auth_peer",0xc0a80100);
-    
+
 //    QHostAddress allowed;
 //    allowed.setAddress(allowedstr);
@@ -174,5 +209,5 @@ bool SyncAuthentication::checkPassword( const QString& password )
     // Second, check sync password...
     QString pass = password.left(6);
-    /* old QtopiaDesktops are sending 
+    /* old QtopiaDesktops are sending
      * rootme newer versions got a Qtopia
      * prefixed. Qtopia prefix will suceed
@@ -181,5 +216,5 @@ bool SyncAuthentication::checkPassword( const QString& password )
      */
     if ( pass == "rootme" || pass == "Qtopia") {
-          
+
   QString cpassword = QString::fromLocal8Bit( crypt( password.mid(8).local8Bit(), "qp" ) );
   Config cfg("Security");
@@ -225,9 +260,9 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name  )
   startTimer( 0 );
     } else
-#endif  
+#endif
     {
   connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
   connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
-  
+
   passiv = FALSE;
   for( int i = 0; i < 4; i++ )
@@ -628,5 +663,5 @@ void ServerPI::process( const QString& message )
         send( "213 " + QString::number(guess) );
     }
-      }     
+      }
   }
     }
@@ -1178,5 +1213,5 @@ void ServerDTP::readyRead()
   if ( !gzipProc->isRunning() )
       gzipProc->start();
-  
+
         QByteArray s;
   s.resize( bytesAvailable() );
@@ -1261,5 +1296,5 @@ void ServerDTP::sendGzipFile( const QString &fn,
        SIGNAL( readyReadStdout() ), SLOT( gzipTarBlock() ) );
 
-    gzipProc->setArguments( "gzip" ); 
+    gzipProc->setArguments( "gzip" );
     connect( gzipProc, SIGNAL( readyReadStdout() ),
        SLOT( writeTargzBlock() ) );
@@ -1307,5 +1342,5 @@ void ServerDTP::retrieveGzipFile( const QString &fn )
     mode = RetrieveGzipFile;
 
-    gzipProc->setArguments( "gunzip" ); 
+    gzipProc->setArguments( "gunzip" );
     connect( gzipProc, SIGNAL( readyReadStdout() ),
        SLOT( tarExtractBlock() ) );