X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Fuuid.cpp;h=c0e512ff11e88c86c7bd50541f6263f5b0976406;hb=e0521275eee34ef6feb06612512c611bb3c3b518;hp=4ff8d1d21b854adfd0e3659164fa711bf55e4e4a;hpb=969329975a0af9d346c76dc34e9ff9cd54cc61ee;p=xestiaab%2F.git

diff --git a/source/common/uuid.cpp b/source/common/uuid.cpp
index 4ff8d1d..c0e512f 100644
--- a/source/common/uuid.cpp
+++ b/source/common/uuid.cpp
@@ -2,8 +2,9 @@
 
 wxString GenerateUUID()
 {
-    
+
 #if defined(__WIN32__)
+#include <rpc.h>
     UUID UUIDData;
     UuidCreate(&UUIDData);
     wchar_t* UUIDStr = 0;
@@ -11,35 +12,38 @@ wxString GenerateUUID()
     wxString Result(UUIDStr);
 #elif defined(__HAIKU__)
     
-#elif defined(__APPLE__)
+#else
     
-    wxString Result;
+#include <stdio.h>
     
-#else
+    wxString Result;
     
-#include <ossp/uuid++.hh>
+    FILE *uuid_hdl = popen("uuidgen", "r");
     
-    uuid_t *uuid;
-    uuid_create(&uuid);
-    char *strdata;
+    if (uuid_hdl == NULL) {
+	return Result;
+    }
     
-    //strdata = ;
+    char strdata[64];
+    std::string uuidout;
     
-    strdata = NULL;
+    size_t readsize;
+    int size = 0;
+    int maxsize = 63;
     
-    uuid_make(uuid, UUID_MAKE_V4);
-    uuid_export(uuid, UUID_FMT_STR, &strdata, NULL);
-    uuid_destroy(uuid);
+    while (fgets(strdata, sizeof(strdata), uuid_hdl) != NULL){
+	uuidout.append(strdata);
+    }
     
-    wxString Result = wxString::FromUTF8(strdata);
+    pclose(uuid_hdl);
     
-    delete strdata;
-    strdata = NULL;
+    Result = wxString::Format(wxT("%s"), uuidout);
+    Result.Trim();
     
 #endif
     
     return Result;
-    
+        
 }
 
 bool CheckUUID(wxString UUIDInc)
@@ -49,4 +53,4 @@ bool CheckUUID(wxString UUIDInc)
     
     return Result;
     
-}
\ No newline at end of file
+}