X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemparse.cc;h=c2557dfd325ad8c52bb311e767f9ddf17284f929;hb=7253c10fe79f6a72b0aec419560823a16ad55a0a;hp=704d7b5272fd9ca57943adece5dbdce276b214f4;hpb=9da805a13af25708dcf567f15ea7c1acf31462f1;p=m6w6%2Flibmemcached

diff --git a/clients/memparse.cc b/clients/memparse.cc
index 704d7b52..c2557dfd 100644
--- a/clients/memparse.cc
+++ b/clients/memparse.cc
@@ -37,6 +37,8 @@
 
 #include <config.h>
 
+#include <cstdio>
+#include <cstring>
 #include <iostream>
 
 #include <libmemcached/memcached.h>
@@ -44,23 +46,24 @@
 int main(int argc, char *argv[])
 {
 
-  if (argc != 2)
+  if (argc < 2)
   {
-    std::cerr << "Wrong number of arguments" << std::endl;
+    std::cerr << "No arguments provided." << std::endl;
     return EXIT_FAILURE;
   }
 
-  memcached_st *memc;
-
-  memc= memcached_create(NULL);
-
-  memcached_return_t rc= memcached_parse_configuration(memc, argv[1], strlen(argv[1]));
-  memcached_free(memc);
-
-  if (rc != MEMCACHED_SUCCESS)
+  for (int x= 1; x < argc; x++)
   {
-    std::cerr << "Failed to parse options" << std::endl;
-    return EXIT_FAILURE;
+    char buffer[BUFSIZ];
+    memcached_return_t rc;
+    rc= libmemcached_check_configuration(argv[x], strlen(argv[x]), buffer, sizeof(buffer));
+
+    if (rc != MEMCACHED_SUCCESS)
+    {
+      std::cerr << "Failed to parse argument #" << x << " " << argv[x] << std::endl;
+      std::cerr << buffer << std::endl;
+      return EXIT_FAILURE;
+    }
   }
 
   return EXIT_SUCCESS;