projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updating to remove memory leak in functions.c (aka test cases).
[m6w6/libmemcached]
/
src
/
memcat.c
diff --git
a/src/memcat.c
b/src/memcat.c
index 81c0a85d6167c40e0cc973a21be9d578f36a34d9..1ee024279620ac982066d865f2948d13992a3b8b 100644
(file)
--- a/
src/memcat.c
+++ b/
src/memcat.c
@@
-1,11
+1,15
@@
#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"
#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[]);
/* Prototypes */
void options_parse(int argc, char *argv[]);
@@
-26,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;
+
+ if ((temp= getenv("MEMCACHED_SERVERS")))
+ opt_servers= strdup(temp);
+ else
+ exit(1);
+ }
+
+ memc= memcached_create(NULL);
-
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);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
@@
-55,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->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);
@@
-76,6
+91,11
@@
void options_parse(int argc, char *argv[])
int option_index= 0;
int option_rv;
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},
static struct option long_options[]=
{
{"version", no_argument, NULL, OPT_VERSION},
@@
-102,12
+122,10
@@
void options_parse(int argc, char *argv[])
opt_verbose = OPT_DEBUG;
break;
case OPT_VERSION: /* --version or -V */
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 */
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);
break;
case OPT_SERVERS: /* --servers or -s */
opt_servers= strdup(optarg);