X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemrm.cc;h=50ead7a380679a09b61746849c9a6f642cf510cd;hb=8c44ea2a34b6cedf545fd07a568bddad74e9b69e;hp=cbfcd2418e64a577a9096e7a0991fc8edb02cf23;hpb=77e79fb2056c9a177a670da48178fd1ac051d33d;p=awesomized%2Flibmemcached

diff --git a/clients/memrm.cc b/clients/memrm.cc
index cbfcd241..50ead7a3 100644
--- a/clients/memrm.cc
+++ b/clients/memrm.cc
@@ -1,4 +1,5 @@
 /* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
@@ -8,15 +9,16 @@
  * Summary:
  *
  */
-#include "config.h"
+#include "mem_config.h"
 
+#include <cerrno>
 #include <cstdio>
 #include <cstring>
 #include <getopt.h>
 #include <iostream>
 #include <unistd.h>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 #include "client_options.h"
 #include "utilities.h"
 
@@ -36,13 +38,10 @@ static void options_parse(int argc, char *argv[]);
 
 int main(int argc, char *argv[])
 {
-  memcached_st *memc;
-  memcached_server_st *servers;
-
   options_parse(argc, argv);
   initialize_sockets();
 
-  if (opt_servers == 0)
+  if (opt_servers == NULL)
   {
     char *temp;
 
@@ -50,17 +49,24 @@ int main(int argc, char *argv[])
     {
       opt_servers= strdup(temp);
     }
-    else
+
+    if (opt_servers == NULL)
     {
       std::cerr << "No Servers provided" << std::endl;
-      return EXIT_FAILURE;
+      exit(EXIT_FAILURE);
     }
   }
 
-  memc= memcached_create(NULL);
+  memcached_server_st* servers= memcached_servers_parse(opt_servers);
+  if (servers == NULL or memcached_server_list_count(servers) == 0)
+  {
+    std::cerr << "Invalid server list provided:" << opt_servers << std::endl;
+    return EXIT_FAILURE;
+  }
+
+  memcached_st* memc= memcached_create(NULL);
   process_hash_option(memc, opt_hash);
 
-  servers= memcached_servers_parse(opt_servers);
   memcached_server_push(memc, servers);
   memcached_server_list_free(servers);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
@@ -97,7 +103,7 @@ int main(int argc, char *argv[])
         std::cerr << "Could not find key \"" << argv[optind] << "\"" << std::endl;
       }
     }
-    else if (memcached_failed(rc))
+    else if (memcached_fatal(rc))
     {
       if (opt_verbose)
       {
@@ -203,7 +209,13 @@ static void options_parse(int argc, char *argv[])
       break;
 
     case OPT_EXPIRE: /* --expire */
+      errno= 0;
       opt_expire= (time_t)strtoll(optarg, (char **)NULL, 10);
+      if (errno != 0)
+      {
+        std::cerr << "Incorrect value passed to --expire: `" << optarg << "`" << std::endl;
+        exit(EXIT_FAILURE);
+      }
       break;
 
     case OPT_HASH: