X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcat.c;h=7d2c14db13ca48b3b0d170037b520747d4bea3ab;hb=347434b799ba94bd621df9a1d277ff8a36157f21;hp=79dc62207c4c458885401d24e7a8023f866a4496;hpb=4c269c98f4b92850758184713a305679dffb60d3;p=m6w6%2Flibmemcached diff --git a/src/memcat.c b/src/memcat.c index 79dc6220..7d2c14db 100644 --- a/src/memcat.c +++ b/src/memcat.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include @@ -16,7 +16,8 @@ void options_parse(int argc, char *argv[]); 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[]) { @@ -36,10 +37,14 @@ int main(int argc, char *argv[]) if ((temp= getenv("MEMCACHED_SERVERS"))) opt_servers= strdup(temp); else + { + fprintf(stderr, "No Servers provided\n"); exit(1); + } } memc= memcached_create(NULL); + process_hash_option(memc, opt_hash); servers= memcached_servers_parse(opt_servers); @@ -80,7 +85,10 @@ int main(int argc, char *argv[]) memcached_free(memc); - free(opt_servers); + if (opt_servers) + free(opt_servers); + if (opt_hash) + free(opt_hash); return 0; } @@ -104,6 +112,7 @@ void options_parse(int argc, char *argv[]) {"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}, }; @@ -130,6 +139,9 @@ void options_parse(int argc, char *argv[]) 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);