X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Fuuid.cpp;h=f28510ecaf85937334f0306e8ecf933a757d2b7a;hb=289f8794830bbd44fc4eb04c0f14a574f9f50c3f;hp=f3603b19733fbcfee9fa36cb7f3bd2edc18a9a78;hpb=c4cb141646798aeb76fff22948bcb7d155c8a7e1;p=xestiaab%2F.git
diff --git a/source/common/uuid.cpp b/source/common/uuid.cpp
index f3603b1..f28510e 100644
--- a/source/common/uuid.cpp
+++ b/source/common/uuid.cpp
@@ -1,52 +1,64 @@
+// 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
+
#include
wxString GenerateUUID()
{
#if defined(__WIN32__)
- UUID UUIDData;
- UuidCreate(&UUIDData);
- wchar_t* UUIDStr = 0;
- UuidToString(&UUIDData, (RPC_WSTR*)&UUIDStr);
- wxString Result(UUIDStr);
+
+#include
+
+ UUID UUIDData;
+ UuidCreate(&UUIDData);
+ wchar_t* UUIDStr = 0;
+ UuidToString(&UUIDData, (RPC_WSTR*)&UUIDStr);
+ wxString Result(UUIDStr);
+
#elif defined(__HAIKU__)
#else
#include
- wxString Result;
+ wxString Result;
- FILE *uuid_hdl = popen("uuidgen", "r");
+ FILE *uuid_hdl = popen("uuidgen", "r");
- if (uuid_hdl == NULL) {
- return Result;
- }
+ if (uuid_hdl == NULL) {
+ return Result;
+ }
- char strdata[64];
- std::string uuidout;
+ 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);
+ }
- while (fgets(strdata, sizeof(strdata), uuid_hdl) != NULL){
- uuidout.append(strdata);
- }
+ pclose(uuid_hdl);
- pclose(uuid_hdl);
+ Result = wxString::Format(wxT("%s"), uuidout);
+ Result.Trim();
#endif
- return Result;
+ return Result;
-}
-
-bool CheckUUID(wxString UUIDInc)
-{
-
- bool Result = FALSE;
-
- return Result;
-
}
\ No newline at end of file