Needed to add memset to remove crashing case in memslap

[awesomized/libmemcached] / src / utilities.c

diff --git a/src/utilities.c b/src/utilities.c
index ed0dbb308d917d119a5b60c76fbb58eea6457867..1dfd60b254e841680f49b59084bae0ab3ccb8991 100644 (file)
--- a/src/utilities.c
+++ b/src/utilities.c
@@ -1,60 +1,8 @@
+#include <stdio.h>
 #include <ctype.h>
-#include <strings.h>
+#include <string.h>
 #include "utilities.h"
 
-memcached_server_st *parse_opt_servers(char *server_strings)
-{
-  char *string;
-  unsigned int port;
-  char *begin_ptr;
-  char *end_ptr;
-  memcached_server_st *servers= NULL;
-  memcached_return rc;
-
-  assert(server_strings);
-
-  end_ptr= server_strings + strlen(server_strings);
-
-  for (begin_ptr= server_strings, string= index(server_strings, ','); 
-       begin_ptr != end_ptr; 
-       string= index(begin_ptr, ','))
-  {
-    char buffer[HUGE_STRING_LEN];
-    char *ptr;
-    port= 0;
-
-    memset(buffer, 0, HUGE_STRING_LEN);
-    if (string)
-    {
-      memcpy(buffer, begin_ptr, string - begin_ptr);
-      begin_ptr= string+1;
-    }
-    else
-    {
-      size_t length= strlen(begin_ptr);
-      memcpy(buffer, begin_ptr, length);
-      begin_ptr= end_ptr;
-    }
-
-    ptr= index(buffer, ':');
-
-    if (ptr)
-    {
-      ptr[0]= 0;
-
-      ptr++;
-
-      port= strtol(ptr, (char **)NULL, 10);
-    }
-
-    servers= memcached_server_list_append(servers, buffer, port, &rc);
-
-    if (isspace(*begin_ptr))
-      begin_ptr++;
-  }
-
-  return servers;
-}
 
 long int timedif(struct timeval a, struct timeval b)
 {
@@ -73,6 +21,32 @@ void version_command(char *command_name)
   exit(0);
 }
 
+char *lookup_help(memcached_options option)
+{
+  switch (option)
+  {
+  case OPT_SERVERS: return("List which servers you wish to connect to.");
+  case OPT_VERSION: return("Display the version of the application and then exit.");
+  case OPT_HELP: return("Diplay this message and then exit.");
+  case OPT_VERBOSE: return("Give more details on the progression of the application.");
+  case OPT_DEBUG: return("Provide output only useful for debugging.");
+  case OPT_FLAG: return("Provide flag information for storage operation.");
+  case OPT_EXPIRE: return("Set the expire option for the object.");
+  case OPT_SET: return("Use set command with memcached when storing.");
+  case OPT_REPLACE: return("Use replace command with memcached when storing.");
+  case OPT_ADD: return("Use add command with memcached when storing.");
+  case OPT_SLAP_EXECUTE_NUMBER: return("Number of times to execute the given test.");
+  case OPT_SLAP_INITIAL_LOAD: return("Number of key pairs to load before executing tests.");
+  case OPT_SLAP_TEST: return("Test to run.");
+  case OPT_SLAP_CONCURRENCY: return("Number of users to simulate with load.");
+  case OPT_SLAP_NON_BLOCK: return("Set TCP up to use non-blocking IO.");
+  case OPT_SLAP_TCP_NODELAY: return("Set TCP socket up to use nodelay.");
+  case OPT_FLUSH: return("Flush servers before running tests.");
+  };
+
+  return "forgot to document this one :)";
+}
+
 void help_command(char *command_name, char *description,
                   const struct option *long_options,
                   memcached_programs_help_st *options)
@@ -84,8 +58,14 @@ void help_command(char *command_name, char *description,
   printf("Current options. A '=' means the option takes a value.\n\n");
 
   for (x= 0; long_options[x].name; x++) 
+  {
+    char *help_message;
+
     printf("\t --%s%c\n", long_options[x].name, 
            long_options[x].has_arg ? '=' : ' ');  
+    if ((help_message= lookup_help(long_options[x].val)))
+      printf("\t\t%s\n", help_message);
+  }
 
   printf("\n");
   exit(0);