#include <stdio.h>
+#include <inttypes.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[]);
memcached_st *memc;
char *string;
size_t string_length;
- uint16_t flags;
+ uint32_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)
{
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->cached_errno)
+ fprintf(stderr, " system error %s", strerror(memc->cached_errno));
+ fprintf(stderr, "\n");
}
optind++;
}
- memcached_deinit(memc);
+ memcached_free(memc);
free(opt_servers);
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},
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);