Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented search mode support using the -s/--search switch on the command line.
[xestiaab/.git]
/
source
/
common
/
uuid.cpp
diff --git
a/source/common/uuid.cpp
b/source/common/uuid.cpp
index
4ff8d1d
..
bc90bdd
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);
@@
-11,35
+11,38
@@
wxString GenerateUUID()
wxString Result(UUIDStr);
#elif defined(__HAIKU__)
wxString Result(UUIDStr);
#elif defined(__HAIKU__)
-#el
if defined(__APPLE__)
+#el
se
- 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;
#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