#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"
static int opt_verbose= 0;
static int opt_displayflag= 0;
-static char *opt_servers;
+static char *opt_servers= NULL;
+static char *opt_hash= NULL;
int main(int argc, char *argv[])
{
memcached_st *memc;
char *string;
size_t string_length;
- uint16_t flags;
+ uint32_t flags;
memcached_return rc;
memcached_server_st *servers;
options_parse(argc, argv);
if (!opt_servers)
- return 0;
+ {
+ char *temp;
+
+ if ((temp= getenv("MEMCACHED_SERVERS")))
+ opt_servers= strdup(temp);
+ else
+ exit(1);
+ }
+
+ memc= memcached_create(NULL);
+ process_hash_option(memc, opt_hash);
- memc= memcached_init(NULL);
+ servers= memcached_servers_parse(opt_servers);
- servers= parse_opt_servers(opt_servers);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
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);
+ if (opt_servers)
+ free(opt_servers);
+ if (opt_hash)
+ free(opt_hash);
return 0;
}
{"debug", no_argument, &opt_verbose, OPT_DEBUG},
{"servers", required_argument, NULL, OPT_SERVERS},
{"flag", no_argument, &opt_displayflag, OPT_FLAG},
+ {"hash", required_argument, NULL, OPT_HASH},
{0, 0, 0, 0},
};
case OPT_SERVERS: /* --servers or -s */
opt_servers= strdup(optarg);
break;
+ case OPT_HASH:
+ opt_hash= strdup(optarg);
+ break;
case '?':
/* getopt_long already printed an error message. */
exit(1);