Bug 795

- Improved detection of uuid library, and the uuid_unparse_lower
  function.

Signed-off-by: Paul Beckingham <paul@beckingham.net>

src/util.cpp

@@ -223,29 +223,28 @@ int autoComplete (
 ////////////////////////////////////////////////////////////////////////////////
 #ifdef HAVE_UUID
 
-#include <uuid/uuid.h>
+#ifndef HAVE_UUID_UNPARSE_LOWER
+// Older versions of libuuid don't have uuid_unparse_lower(), only uuid_unparse()
+void uuid_unparse_lower (uuid_t uu, char *out)
+{
+    uuid_unparse (uu, out);
+    // Characters in out are either 0-9, a-z, '-', or A-Z.  A-Z is mapped to
+    // a-z by bitwise or with 0x20, and the others already have this bit set
+    for (size_t i = 0; i < 36; ++i) out[i] |= 0x20;
+}
+#endif
 
 const std::string uuid ()
 {
   uuid_t id;
   uuid_generate (id);
   char buffer[100] = {0};
-#ifdef SOLARIS
-  uuid_unparse (id, buffer);
-#else
   uuid_unparse_lower (id, buffer);
-#endif
 
   // Bug found by Steven de Brouwer.
   buffer[36] = '\0';
 
-#ifdef SOLARIS
-  std::string data = std::string (buffer);
-  std::transform (data.begin(), data.end(), data.begin(), ::tolower);
-  return data;
-#else
   return std::string (buffer);
-#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////