X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;h=057a585c8e7f61332c23090b0fc273f6c166abbc;hb=064c0dc136f5a60f8aea4641e6dd68d3611a6a54;hp=d263e60da03e1f5cc77e68f6ffab7d5d48b6a8c7;hpb=ccd00450d57624afba24bfbb6e76d1d69d0ad0f8;p=awesomized%2Flibmemcached

diff --git a/src/memcat.c b/src/memcat.c
index d263e60d..057a585c 100644
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -1,11 +1,15 @@
 #include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <memcached.h>
 
-#include "client_options.h"
 #include "utilities.h"
 
+#define PROGRAM_NAME "memcat"
+#define PROGRAM_DESCRIPTION "Cat a set of key values to stdout."
+
 
 /* Prototypes */
 void options_parse(int argc, char *argv[]);
@@ -21,13 +25,26 @@ int main(int argc, char *argv[])
   size_t string_length;
   uint16_t flags;
   memcached_return rc;
-
-  memc= memcached_init(NULL);
+  memcached_server_st *servers;
 
   options_parse(argc, argv);
 
-  if (opt_servers)
-    parse_opt_servers(memc, opt_servers);
+  if (!opt_servers)
+  {
+    char *temp;
+
+    if ((temp= getenv("MEMCACHED_SERVERS")))
+      opt_servers= strdup(temp);
+    else
+      exit(1);
+  }
+
+  memc= memcached_create(NULL);
+
+  servers= memcached_servers_parse(opt_servers);
+
+  memcached_server_push(memc, servers);
+  memcached_server_list_free(servers);
 
   while (optind < argc) 
   {
@@ -50,20 +67,23 @@ int main(int argc, char *argv[])
         free(string);
       }
     }
-    else
+    else if (rc != MEMCACHED_NOTFOUND)
     {
-      fprintf(stderr, "memcat: %s: memcache error %s\n", 
+      fprintf(stderr, "memcat: %s: memcache error %s", 
               argv[optind], memcached_strerror(memc, rc));
+      if (memc->my_errno)
+	fprintf(stderr, " system error %s", strerror(memc->my_errno));
+      fprintf(stderr, "\n");
     }
     optind++;
   }
 
-  memcached_deinit(memc);
+  memcached_free(memc);
 
   free(opt_servers);
 
   return 0;
-};
+}
 
 
 void options_parse(int argc, char *argv[])
@@ -71,6 +91,11 @@ void options_parse(int argc, char *argv[])
   int option_index= 0;
   int option_rv;
 
+  memcached_programs_help_st help_options[]=
+  {
+    {0},
+  };
+
   static struct option long_options[]=
     {
       {"version", no_argument, NULL, OPT_VERSION},
@@ -97,12 +122,10 @@ void options_parse(int argc, char *argv[])
       opt_verbose = OPT_DEBUG;
       break;
     case OPT_VERSION: /* --version or -V */
-      printf("memcache tools, memcat, v1.0\n");
-      exit(0);
+      version_command(PROGRAM_NAME);
       break;
     case OPT_HELP: /* --help or -h */
-      printf("useful help messages go here\n");
-      exit(0);
+      help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, help_options);
       break;
     case OPT_SERVERS: /* --servers or -s */
       opt_servers= strdup(optarg);