Additional fixes from Debian.

[awesomized/libmemcached] / libtest / has.cc

diff --git a/libtest/has.cc b/libtest/has.cc
index accadf9839bbf9a1973196d91d001dd1a79aff13..a7a09cb4da909cb10e3f4eb80eb18a5ecbec4c82 100644 (file)
--- a/libtest/has.cc
+++ b/libtest/has.cc
@@ -2,7 +2,7 @@
  *
  *  Data Differential YATL (i.e. libtest)  library
  *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2012-2013 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -34,9 +34,10 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 #include <libtest/common.h>
 
+#include <cstdio>
 #include <cstdlib>
 #include <unistd.h>
 
@@ -44,20 +45,24 @@ namespace libtest {
 
 bool has_libmemcached(void)
 {
+#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
   if (HAVE_LIBMEMCACHED)
   {
     return true;
   }
+#endif
 
   return false;
 }
 
 bool has_libdrizzle(void)
 {
+#if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
   if (HAVE_LIBDRIZZLE)
   {
     return true;
   }
+#endif
 
   return false;
 }
@@ -80,9 +85,9 @@ bool has_postgres_support(void)
 
 bool has_gearmand()
 {
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
   if (HAVE_GEARMAND_BINARY)
   {
-#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
     std::stringstream arg_buffer;
 
     char *getenv_ptr;
@@ -98,8 +103,8 @@ bool has_gearmand()
     {
       return true;
     }
-#endif
   }
+#endif
 
   return false;
 }
@@ -134,13 +139,17 @@ bool has_mysqld()
   return false;
 }
 
-bool has_memcached()
+static char memcached_binary_path[FILENAME_MAX];
+
+static void initialize_curl_startup()
 {
+  memcached_binary_path[0]= NULL;
+
+#if defined(HAVE_MEMCACHED_BINARY) && HAVE_MEMCACHED_BINARY
   if (HAVE_MEMCACHED_BINARY)
   {
     std::stringstream arg_buffer;
 
-
     char *getenv_ptr;
     if (bool((getenv_ptr= getenv("PWD"))) and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0)
     {
@@ -151,13 +160,46 @@ bool has_memcached()
 
     if (access(arg_buffer.str().c_str(), X_OK) == 0)
     {
-      return true;
+      strncpy(memcached_binary_path, arg_buffer.str().c_str(), FILENAME_MAX);
     }
   }
+#endif
+}
+
+static pthread_once_t memcached_binary_once= PTHREAD_ONCE_INIT;
+static void initialize_memcached_binary(void)
+{
+  int ret;
+  if ((ret= pthread_once(&memcached_binary_once, initialize_curl_startup)) != 0)
+  {
+    FATAL(strerror(ret));
+  }
+}
+
+bool has_memcached()
+{
+  initialize_memcached_binary();
+
+  if (memcached_binary_path[0])
+  {
+    return true;
+  }
 
   return false;
 }
 
+const char* memcached_binary()
+{
+  initialize_memcached_binary();
+
+  if (memcached_binary_path[0])
+  {
+    return memcached_binary_path;
+  }
+
+  return NULL;
+}
+
 bool has_memcached_sasl()
 {
 #if defined(HAVE_MEMCACHED_SASL_BINARY) && HAVE_MEMCACHED_SASL_BINARY
@@ -173,4 +215,14 @@ bool has_memcached_sasl()
   return false;
 }
 
+const char *gearmand_binary() 
+{
+  return GEARMAND_BINARY;
+}
+
+const char *drizzled_binary() 
+{
+  return DRIZZLED_BINARY;
+}
+
 } // namespace libtest