X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Futilities.c;h=ed0dbb308d917d119a5b60c76fbb58eea6457867;hb=8996c21d87b51d6bcc72efd93cbf83cc559498a5;hp=c866dd54038f00960107b789786e4cdff4dbbe3a;hpb=875200dc0c5668bba4f8a68b487f9d2f2a1eedb0;p=m6w6%2Flibmemcached

diff --git a/src/utilities.c b/src/utilities.c
index c866dd54..ed0dbb30 100644
--- a/src/utilities.c
+++ b/src/utilities.c
@@ -1,35 +1,39 @@
-#include <memcached.h>
+#include <ctype.h>
+#include <strings.h>
+#include "utilities.h"
 
-void parse_opt_servers(memcached_st *memc,
-                       char *server_strings)
+memcached_server_st *parse_opt_servers(char *server_strings)
 {
   char *string;
   unsigned int port;
   char *begin_ptr;
   char *end_ptr;
-
-  end_ptr= server_strings + strlen(server_strings);
+  memcached_server_st *servers= NULL;
+  memcached_return rc;
 
   assert(server_strings);
-  assert(memc);
+
+  end_ptr= server_strings + strlen(server_strings);
 
   for (begin_ptr= server_strings, string= index(server_strings, ','); 
-       begin_ptr == end_ptr; 
-       begin_ptr= ++string, string= index(begin_ptr, ','))
+       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(server_strings);
+      size_t length= strlen(begin_ptr);
       memcpy(buffer, begin_ptr, length);
-      string= server_strings+length;
+      begin_ptr= end_ptr;
     }
 
     ptr= index(buffer, ':');
@@ -41,12 +45,48 @@ void parse_opt_servers(memcached_st *memc,
       ptr++;
 
       port= strtol(ptr, (char **)NULL, 10);
-
-      memcached_server_add(memc, buffer, port);
-    }
-    else
-    {
-      memcached_server_add(memc, buffer, 0);
     }
+
+    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)
+{
+  register int us, s;
+
+  us = a.tv_usec - b.tv_usec;
+  us /= 1000;
+  s = a.tv_sec - b.tv_sec;
+  s *= 1000;
+  return s + us;
+}
+
+void version_command(char *command_name)
+{
+  printf("%s v%u.%u\n", command_name, 1, 0);
+  exit(0);
+}
+
+void help_command(char *command_name, char *description,
+                  const struct option *long_options,
+                  memcached_programs_help_st *options)
+{
+  unsigned int x;
+
+  printf("%s v%u.%u\n\n", command_name, 1, 0);
+  printf("\t%s\n\n", description);
+  printf("Current options. A '=' means the option takes a value.\n\n");
+
+  for (x= 0; long_options[x].name; x++) 
+    printf("\t --%s%c\n", long_options[x].name, 
+           long_options[x].has_arg ? '=' : ' ');  
+
+  printf("\n");
+  exit(0);
 }