projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Modified test to allow it to run on slow machines (aka it ran too long)
[awesomized/libmemcached]
/
src
/
memcat.c
diff --git
a/src/memcat.c
b/src/memcat.c
index 7f3c04198435b2d45f71adcbdfcbfd19cbbef982..057a585c8e7f61332c23090b0fc273f6c166abbc 100644
(file)
--- a/
src/memcat.c
+++ b/
src/memcat.c
@@
-1,9
+1,10
@@
#include <stdio.h>
#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
#include <unistd.h>
#include <getopt.h>
#include <memcached.h>
#include <unistd.h>
#include <getopt.h>
#include <memcached.h>
-#include "client_options.h"
#include "utilities.h"
#define PROGRAM_NAME "memcat"
#include "utilities.h"
#define PROGRAM_NAME "memcat"
@@
-29,11
+30,19
@@
int main(int argc, char *argv[])
options_parse(argc, argv);
if (!opt_servers)
options_parse(argc, argv);
if (!opt_servers)
- return 0;
+ {
+ char *temp;
- memc= memcached_init(NULL);
+ if ((temp= getenv("MEMCACHED_SERVERS")))
+ opt_servers= strdup(temp);
+ else
+ exit(1);
+ }
+
+ memc= memcached_create(NULL);
+
+ servers= memcached_servers_parse(opt_servers);
- servers= parse_opt_servers(opt_servers);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
@@
-58,15
+67,18
@@
int main(int argc, char *argv[])
free(string);
}
}
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));
argv[optind], memcached_strerror(memc, rc));
+ if (memc->my_errno)
+ fprintf(stderr, " system error %s", strerror(memc->my_errno));
+ fprintf(stderr, "\n");
}
optind++;
}
}
optind++;
}
- memcached_
deinit
(memc);
+ memcached_
free
(memc);
free(opt_servers);
free(opt_servers);