#include <unistd.h>\r
#include <getopt.h>\r
#include <memcached.h>\r
+\r
#include "client_options.h"\r
+#include "utilities.h"\r
+\r
+\r
+/* Prototypes */\r
+void options_parse(int argc, char *argv[]);\r
\r
static int opt_verbose;\r
static int opt_displayflag;\r
static char *opt_servers;\r
\r
-struct memcached_st *parse_opt_servers (struct memcached_st *m,\r
- char *opt_servers)\r
-{\r
- char *s, *hostname;\r
- unsigned int portnum;\r
- while (s = strsep(&opt_servers, ",")) {\r
- hostname = strsep(&s, ":");\r
- portnum = atoi(s);\r
- memcached_server_add(m, hostname, portnum);\r
- }\r
- return m;\r
-}\r
-\r
int main(int argc, char *argv[])\r
{\r
memcached_st *memc;\r
uint16_t flags;\r
memcached_return rc;\r
\r
+ memc= memcached_init(NULL);\r
+\r
+ options_parse(argc, argv);\r
+\r
+ parse_opt_servers(memc, opt_servers);\r
+\r
+ while (optind <= argc) \r
+ {\r
+ string= memcached_get(memc, argv[argc], strlen(argv[argc]),\r
+ &string_length, &flags, &rc);\r
+ if (rc == MEMCACHED_SUCCESS) \r
+ {\r
+ if (opt_displayflag) \r
+ printf("%d\n", flags);\r
+ else \r
+ {\r
+ printf("%.*s\n", string_length, string);\r
+ free(string);\r
+ }\r
+ }\r
+ optind++;\r
+ }\r
+\r
+ memcached_deinit(memc);\r
+\r
+ return 0;\r
+};\r
+\r
+\r
+void options_parse(int argc, char *argv[])\r
+{\r
+ int option_index = 0;\r
+ int option_rv;\r
+\r
static struct option long_options[] =\r
{\r
{"version", no_argument, NULL, OPT_VERSION},\r
{"flag", no_argument, &opt_displayflag, OPT_FLAG},\r
{0, 0, 0, 0},\r
};\r
- int option_index = 0;\r
- int option_rv;\r
\r
while (1) \r
{\r
exit(0);\r
break;\r
case OPT_SERVERS: /* --servers */\r
- opt_servers = strdup(optarg);\r
+ opt_servers= optarg;\r
break;\r
case '?':\r
/* getopt_long already printed an error message. */\r
abort();\r
}\r
}\r
-\r
- memc= memcached_init(NULL);\r
- memc= parse_opt_servers(memc, opt_servers);\r
- \r
- while (optind <= argc) {\r
- string= memcached_get(memc, argv[optind], strlen(argv[optind]),\r
- &string_length, &flags, &rc);\r
- if (rc == MEMCACHED_SUCCESS) {\r
- if (opt_displayflag) {\r
- printf("%d\n", flags);\r
- } else {\r
- if (string) \r
- {\r
- printf("%.*s\n", string_length, string);\r
- free(string);\r
- }\r
- }\r
- }\r
-\r
- optind++;\r
- }\r
-\r
- memcached_deinit(memc);\r
-\r
- return 0;\r
-};\r
+}\r