projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Needed to add memset to remove crashing case in memslap
[awesomized/libmemcached]
/
src
/
memrm.c
diff --git
a/src/memrm.c
b/src/memrm.c
index 11dbb82c7e84dfb790595bad596677f73a7d9494..09f58ea4d76b83eeeca69c02798b0cb11b5c982f 100644
(file)
--- a/
src/memrm.c
+++ b/
src/memrm.c
@@
-2,6
+2,7
@@
#include <unistd.h>
#include <getopt.h>
#include <memcached.h>
#include <unistd.h>
#include <getopt.h>
#include <memcached.h>
+#include <string.h>
#include "client_options.h"
#include "utilities.h"
#include "client_options.h"
#include "utilities.h"
@@
-24,11
+25,18
@@
int main(int argc, char *argv[])
options_parse(argc, argv);
if (!opt_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_
init
(NULL);
+ memc= memcached_
create
(NULL);
- servers=
parse_opt_servers
(opt_servers);
+ servers=
memcached_servers_parse
(opt_servers);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
@@
-40,14
+48,17
@@
int main(int argc, char *argv[])
if (rc != MEMCACHED_SUCCESS)
{
if (rc != MEMCACHED_SUCCESS)
{
- fprintf(stderr, "memrm: %s: memcache error %s
\n
",
+ fprintf(stderr, "memrm: %s: memcache error %s",
argv[optind], memcached_strerror(memc, rc));
argv[optind], memcached_strerror(memc, rc));
+ if (memc->cached_errno)
+ fprintf(stderr, " system error %s", strerror(memc->cached_errno));
+ fprintf(stderr, "\n");
}
optind++;
}
}
optind++;
}
- memcached_
deinit
(memc);
+ memcached_
free
(memc);
free(opt_servers);
free(opt_servers);