Merge Mark's test code.

diff --git a/src/memcat.c b/src/memcat.c
index 924b16d871e59dd0a971da35f6324b8ebe9955e5..d336067687992108c0eeaeb91d700b228370038f 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
   if (opt_servers)\r
     parse_opt_servers(memc, opt_servers);\r
 \r
-  while (optind <= argc) \r
+  while (optind < argc) \r
   {\r
     string= memcached_get(memc, argv[optind], strlen(argv[optind]),\r
                           &string_length, &flags, &rc);\r

diff --git a/src/memrm.c b/src/memrm.c
index 1fa9f409b08703cc93741e43e4fad826a143b87b..005a913d320b235bba18d255b4acd58bc6df2f9a 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -21,12 +21,10 @@ int main(int argc, char *argv[])
 \r
   memc= memcached_init(NULL);\r
 \r
-  parse_opt_servers(memc, opt_servers);\r
-\r
   if (opt_servers)\r
     parse_opt_servers(memc, opt_servers);\r
   \r
-  while (optind <= argc) \r
+  while (optind < argc) \r
   {\r
     if (opt_verbose) \r
       printf("key: %s\nexpires: %llu\n", argv[optind], (unsigned long long)opt_expire);\r

diff --git a/src/memstat.c b/src/memstat.c
index a01c35baada79964e2275d4cec7fe94e99e2e1c3..3d30d16b8235a5acc77ed3c6f9a9bd02d13385d8 100644 (file)
--- a/src/memstat.c
+++ b/src/memstat.c
@@ -25,7 +25,8 @@ int main(int argc, char *argv[])
   memc= memcached_init(NULL);
   options_parse(argc, argv);
 
-  parse_opt_servers(memc, opt_servers);
+  if (opt_servers)
+    parse_opt_servers(memc, opt_servers);
 
   memcached_deinit(memc);
 

diff --git a/tests/test.c b/tests/test.c
index f4ba3480380534ad5b0dc6be77d2b62c3f9da6cb..af27e8cd53ba1d43511a35dfdb58b336752527d0 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -170,6 +170,40 @@ void get_test2(void)
   memcached_deinit(memc);
 }
 
+void get_test3(void)
+{
+  memcached_st *memc;
+  memcached_return rc;
+  char *key= "foo";
+  char *value;
+  size_t value_length= 8191;
+  char *string;
+  size_t string_length;
+  uint16_t flags;
+  int i;
+
+  value = (char*) malloc(value_length);
+  for (i=0; i<value_length; i++)
+    value[i] = (char) (i % 127);
+
+  memc= memcached_init(NULL);
+  assert(memc);
+  rc= memcached_set(memc, key, strlen(key), 
+                    value, value_length,
+                    (time_t)0, (uint16_t)0);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  string= memcached_get(memc, key, strlen(key),
+                        &string_length, &flags, &rc);
+
+  assert(string_length == value_length);
+  assert(!memcmp(string, value, string_length));
+
+  free(string);
+
+  memcached_deinit(memc);
+}
+
 void stats_hostname_test(void)
 {
   memcached_return rc;
@@ -326,6 +360,7 @@ int main(void)
   flush_test();
   get_test();
   get_test2();
+  get_test3();
   stats_hostname_test();
 
   increment_test();