Merge branch 'master' of ssh://digit.mahou.co.uk/home/kirinji/repos/xestiaab

[xestiaab/.git] / source / common / uuid.cpp

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