Ticket #303: windows_uuid.patch

xapian-core/common/safeuuid.h

@@ +1 @@
+/** @file safeuuid.h
+ *  @brief #include <uuid/uuid.h>, with alternative implementation for windows.
+ */
+/* Copyright (C) 2008 Lemur Consulting Ltd
+ *
+ * This program 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; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef XAPIAN_INCLUDED_SAFEUUID_H
+#define XAPIAN_INCLUDED_SAFEUUID_H
+
+#ifdef __WIN32__
+# include "common/win32_uuid.h"
+#else
+# include <uuid/uuid.h>
+#endif
+
+#endif // XAPIAN_INCLUDED_SAFEUUID_H

xapian-core/common/win32_uuid.h

@@ +1 @@
+/* @file win32_uuid.h
+ * @brief Provide UUID functions compatible with libuuid from e2fsprogs.
+ */
+/* Copyright 2008 Lemur Consulting Ltd
+ *
+ * This program 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; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef XAPIAN_INCLUDED_WIN32_UUID_H
+#define XAPIAN_INCLUDED_WIN32_UUID_H
+
+#if !defined __CYGWIN__ && !defined __WIN32__
+# error Including win32_uuid.h, but neither __CYGWIN__ nor __WIN32__ defined!
+#endif
+
+#include "safewindows.h"
+#include <rpc.h>
+
+// Unfortunately Windows defines uuid_t as GUID, so we redefine it to match the
+// Unix definition.
+#undef uuid_t
+typedef unsigned char uuid_t[16];
+
+void uuid_generate(uuid_t uu);
+
+int uuid_parse(const char * in, uuid_t uu);
+
+void uuid_unparse_lower(const uuid_t uu, char * out);
+
+void uuid_clear(uuid_t uu);
+
+int uuid_is_null(const uuid_t uu);
+
+#endif /* XAPIAN_INCLUDED_WIN32_UUID_H */

xapian-core/common/win32_uuid.cc

@@ +1 @@
+/* @file win32_uuid.cc
+ * @brief Provide UUID functions compatible with libuuid from e2fsprogs.
+ */
+/* Copyright (C) 2008 Lemur Consulting Ltd
+ *
+ * This program 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <config.h>
+
+#include "win32_uuid.h"
+
+#include <xapian/error.h>
+
+void
+uuid_generate(uuid_t uu)
+{
+    UUID uuid;
+    if (UuidCreate(&uuid) != RPC_S_OK) {
+        // Throw a DatabaseCreateError, since we can't make a UUID.  The
+        // windows API documentation is a bit unclear about the situations in
+        // which this can happen, but if this behaviour causes a problem, an
+        // alternative would be to create a UUID ourselves somehow in this
+        // situation.
+        throw Xapian::DatabaseCreateError("Cannot create UUID");
+    }
+    memcpy(uu, &uuid, 16);
+}
+
+int
+uuid_parse(const char * in, uuid_t uu)
+{
+    UUID uuid;
+    if (UuidFromString((unsigned char*)in, &uuid) != RPC_S_OK)
+        return -1;
+    memcpy(uu, &uuid, 16);
+    return 0;
+}
+
+void uuid_unparse_lower(const uuid_t uu, char *  out)
+{
+    UUID uuid;
+    char *uuidstr;
+    memcpy(&uuid, uu, 16);
+    if (UuidToString(&uuid, (unsigned char **)(&uuidstr)) != RPC_S_OK)
+        return;
+    int uuidlen = strlen(uuidstr);
+    strncpy( out, strlwr(uuidstr), uuidlen );
+    RpcStringFree((unsigned char**)(&uuidstr));
+}
+
+void uuid_clear(uuid_t uu)
+{
+    memset(uu, 0x00, 16);
+}
+
+int uuid_is_null(const uuid_t uu)
+{
+    int i = 0;
+    while (i < 16) {
+        if (uu[i++])
+            return 0;
+    }
+    return 1;
+}

xapian-core/backends/chert/chert_version.h

@@ -24 +24 @@
 #include <cstring>
 #include <string>
 
-#include <uuid/uuid.h>
+#include "common/safeuuid.h"
 
 /** The ChertVersion class manages the "iamchert" file.
  *

xapian-core/backends/chert/chert_version.cc

@@ -38 +38 @@
 #include <cstring> // For memcmp() and memcpy().
 #include <string>
 
-#include <uuid/uuid.h>
+#include "common/safeuuid.h"
 
 using namespace std;
 

xapian-core/backends/flint/flint_version.cc

@@ -37 +37 @@
 #include <cstring> // For memcmp() and memcpy().
 #include <string>
 
-#include <uuid/uuid.h>
+#include "common/safeuuid.h"
 
 using std::string;
 

xapian-core/backends/flint/flint_version.h

@@ -24 +24 @@
 #include <cstring>
 #include <string>
 
-#include <uuid/uuid.h>
+#include "common/safeuuid.h"
 
 /** The FlintVersion class manages the "iamflint" file.
  *