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

diff --git a/source/common/uuid.cpp b/source/common/uuid.cpp
index 4ff8d1d..a5cd6fa 100644
--- a/source/common/uuid.cpp
+++ b/source/common/uuid.cpp
@@ -1,9 +1,28 @@
+// uuid.cpp - UUID subroutines.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include <wx/wx.h>
 
 wxString GenerateUUID()
 {
-    
+
 #if defined(__WIN32__)
+#include <rpc.h>
     UUID UUIDData;
     UuidCreate(&UUIDData);
     wchar_t* UUIDStr = 0;
@@ -11,35 +30,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 +71,4 @@ bool CheckUUID(wxString UUIDInc)
     
     return Result;
     
-}
\ No newline at end of file
+}