X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemrm.c;h=3e468a3d875d6619621386bc2a9d5c1505c5717c;hb=875200dc0c5668bba4f8a68b487f9d2f2a1eedb0;hp=4a3da0218b5032f4f1aaab4580d5cf6f2401dfbb;hpb=ca065f55235fd9979ede818963780f417d70c64e;p=awesomized%2Flibmemcached

diff --git a/src/memrm.c b/src/memrm.c
index 4a3da021..3e468a3d 100644
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -3,36 +3,73 @@
 #include <getopt.h>
 #include <memcached.h>
 #include "client_options.h"
+#include "utilities.h"
 
-static int opt_verbose;
-static char *opt_servers;
+static int opt_verbose= 0;
+static time_t opt_expire= 0;
+static char *opt_servers= NULL;
+
+/* Prototypes */
+void options_parse(int argc, char *argv[]);
 
 int main(int argc, char *argv[])
 {
   memcached_st *memc;
-  char *string;
-  size_t string_length;
-  time_t expires = 0;
   memcached_return rc;
 
-  static struct option long_options[] =
+  options_parse(argc, argv);
+
+  memc= memcached_init(NULL);
+
+  parse_opt_servers(memc, opt_servers);
+
+  if (opt_servers)
+    parse_opt_servers(memc, opt_servers);
+  
+  while (optind <= argc) 
+  {
+    if (opt_verbose) 
+      printf("key: %s\nexpires: %llu\n", argv[optind], (unsigned long long)opt_expire);
+    rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), opt_expire);
+
+    if (rc != MEMCACHED_SUCCESS) 
     {
-      {"version", no_argument, NULL, OPT_VERSION},
-      {"help", no_argument, NULL, OPT_HELP},
-      {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
-      {"debug", no_argument, &opt_verbose, OPT_DEBUG},
-      {"servers", required_argument, NULL, OPT_SERVERS},
-      {"expire", required_argument, NULL, OPT_EXPIRE},
-      {0, 0, 0, 0},
-    };
-  int option_index = 0;
+      fprintf(stderr, "memrm: %s: memcache error %s\n", 
+	      argv[optind], memcached_strerror(memc, rc));
+    }
+
+    optind++;
+  }
+
+  memcached_deinit(memc);
+
+  free(opt_servers);
+
+  return 0;
+}
+
+
+void options_parse(int argc, char *argv[])
+{
+  static struct option long_options[]=
+  {
+    {"version", no_argument, NULL, OPT_VERSION},
+    {"help", no_argument, NULL, OPT_HELP},
+    {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
+    {"debug", no_argument, &opt_verbose, OPT_DEBUG},
+    {"servers", required_argument, NULL, OPT_SERVERS},
+    {"expire", required_argument, NULL, OPT_EXPIRE},
+    {0, 0, 0, 0},
+  };
+  int option_index= 0;
   int option_rv;
 
   while (1) 
   {
-    option_rv = getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
+    option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
     if (option_rv == -1) break;
-    switch (option_rv) {
+    switch (option_rv)
+    {
     case 0:
       break;
     case OPT_VERSION: /* --version or -V */
@@ -44,10 +81,10 @@ int main(int argc, char *argv[])
       exit(0);
       break;
     case OPT_SERVERS: /* --servers or -s */
-      opt_servers = optarg;
+      opt_servers= strdup(optarg);
       break;
     case OPT_EXPIRE: /* --expire */
-      expires = (time_t)strtol(optarg, (char **)NULL, 10);
+      opt_expire= (time_t)strtoll(optarg, (char **)NULL, 10);
       break;
     case '?':
       /* getopt_long already printed an error message. */
@@ -56,26 +93,4 @@ int main(int argc, char *argv[])
       abort();
     }
   }
-
-  memc= memcached_init(NULL);
-  parse_opt_servers(memc, opt_servers);
-  
-  while (optind <= argc) 
-  {
-    if (opt_verbose) 
-      printf("key: %s\nexpires: %llu\n", argv[optind], expires);
-    rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), expires);
-
-    if (rc != MEMCACHED_SUCCESS) 
-    {
-      fprintf(stderr, "memrm: %s: memcache error %s\n", 
-	      argv[optind], memcached_strerror(memc, rc));
-    }
-
-    optind++;
-  }
-
-  memcached_deinit(memc);
-
-  return 0;
-};
+}