Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0793e0a
)
Adjusted UUID generation so it fetches from an application called uuidgen on non...
author
Kiri
<kiri@Kiriha.LasLindas>
Wed, 12 Aug 2015 14:29:06 +0000
(15:29 +0100)
committer
Kiri
<kiri@Kiriha.LasLindas>
Wed, 12 Aug 2015 14:29:06 +0000
(15:29 +0100)
source/common/uuid.cpp
patch
|
blob
|
history
diff --git
a/source/common/uuid.cpp
b/source/common/uuid.cpp
index
4ff8d1d
..
a658829
100644
(file)
--- a/
source/common/uuid.cpp
+++ b/
source/common/uuid.cpp
@@
-2,7
+2,7
@@
wxString GenerateUUID()
{
wxString GenerateUUID()
{
-
+
#if defined(__WIN32__)
UUID UUIDData;
UuidCreate(&UUIDData);
#if defined(__WIN32__)
UUID UUIDData;
UuidCreate(&UUIDData);
@@
-17,29
+17,46
@@
wxString GenerateUUID()
#else
#else
-#include <ossp/uuid++.hh>
+#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);
+
+/*#include <uuid/uuid.h>
uuid_t *uuid;
uuid_create(&uuid);
uuid_t *uuid;
uuid_create(&uuid);
- char *strdata;
-
- //strdata = ;
+ char *strdata[100];
strdata = NULL;
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;
wxString Result = wxString::FromUTF8(strdata);
delete strdata;
- strdata = NULL;
+ strdata = NULL;
*/
#endif
return Result;
#endif
return Result;
-
+
}
bool CheckUUID(wxString UUIDInc)
}
bool CheckUUID(wxString UUIDInc)
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy