X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcp.c;h=ec9a2fafb12a2b1bf88389cb4c6d6585c7ef5b32;hb=5672a07389f0e0ea5dc4858c02ac3f3bc7ecf3f7;hp=3430ab54ad935be6815ef7b8dfc28ddd338f9c26;hpb=aadeadec9c2ca09c41a5dc2d63a34c465d39df3a;p=m6w6%2Flibmemcached

diff --git a/src/memcp.c b/src/memcp.c
index 3430ab54..ec9a2faf 100644
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -1,92 +1,174 @@
 #include <stdio.h>
+#include <unistd.h>
+#include <getopt.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/mman.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include <memcached.h>
+#include "client_options.h"
+#include "utilities.h"
+
+/* Prototypes */
+void options_parse(int argc, char *argv[]);
+
+static int opt_verbose= 0;
+static char *opt_servers= NULL;
+static int opt_method= OPT_SET;
+static uint16_t opt_flags= 0;
+static time_t opt_expires= 0;
 
 int main(int argc, char *argv[])
 {
   memcached_st *memc;
-  char *string;
-  unsigned int x;
-  size_t string_length;
-  uint16_t  flags;
   memcached_return rc;
 
-  if (argc < 3)
-    return 0;
+  options_parse(argc, argv);
 
   memc= memcached_init(NULL);
 
-  /* Get the server name */
+  if (opt_servers)
+    parse_opt_servers(memc, opt_servers);
+  else
+    parse_opt_servers(memc, argv[--argc]);
+
+  while (optind < argc) 
   {
+    struct stat sbuf;
+    int fd;
     char *ptr;
-    char *hostname;
-    size_t hostname_length;
-    unsigned int port;
-
-    ptr= index(argv[argc-1], ':');
+    ssize_t read_length;
+    char *file_buffer_ptr;
 
-    if (ptr)
+    fd= open(argv[optind], O_RDONLY);
+    if (fd < 0)
     {
-      hostname_length= ptr - argv[argc-1];
-      hostname= (char *)malloc(hostname_length+1);
-      memset(hostname, 0, hostname_length+1);
-      memcpy(hostname, argv[argc-1], hostname_length);
-
-      ptr++;
+      fprintf(stderr, "memcp: %s: %s\n", argv[optind], strerror(errno));
+      optind++;
+      continue;
+    }
 
-      port= strtol(ptr, (char **)NULL, 10);
+    (void)fstat(fd, &sbuf);
 
-      memcached_server_add(memc, hostname, port);
-      free(hostname);
-    }
+    ptr= rindex(argv[optind], '/');
+    if (ptr)
+      ptr++;
     else
+      ptr= argv[optind];
+
+    if (opt_verbose) 
     {
-      memcached_server_add(memc, argv[argc -1], 0);
+      static char *opstr[] = { "set", "add", "replace" };
+      printf("op: %s\nsource file: %s\nlength: %zu\n"
+	     "key: %s\nflags: %x\n expires: %llu\n",
+	     opstr[opt_method], argv[optind], (size_t)sbuf.st_size,
+	     ptr, opt_flags, (unsigned long long)opt_expires);
     }
-  }
-
-  for (x= 1; x < argc-1; x++)
-  {
-    char *mptr;
-    struct stat sbuf;
-    int fd;
-    char *ptr;
 
-    fd= open(argv[x], O_RDONLY);
-
-    if (fd == -1)
+    if ((file_buffer_ptr= (char *)malloc(sizeof(char) * sbuf.st_size)) == NULL)
     {
-      fprintf(stderr, "Failed opening %s\n", argv[x]);
+      fprintf(stderr, "malloc: %s\n", strerror(errno)); 
       exit(1);
     }
 
-    (void)fstat(fd, &sbuf);
-    mptr= mmap(NULL, sbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-
-    ptr= rindex(argv[x], '/');
-    if (ptr)
+    if ((read_length= read(fd, file_buffer_ptr, sbuf.st_size)) == -1)
     {
-      ptr++;
+      fprintf(stderr, "read: %s\n", strerror(errno)); 
+      exit(1);
     }
+    assert(read_length == sbuf.st_size);
+
+    if (opt_method == OPT_ADD)
+      rc= memcached_add(memc, ptr, strlen(ptr),
+                        file_buffer_ptr, sbuf.st_size,
+			opt_expires, opt_flags);
+    else if (opt_method == OPT_REPLACE)
+      rc= memcached_replace(memc, ptr, strlen(ptr),
+			    file_buffer_ptr, sbuf.st_size,
+			    opt_expires, opt_flags);
     else
-    {
-      ptr= argv[x];
-    }
-    
-    rc= memcached_set(memc, ptr, strlen(ptr),
-                      mptr, sbuf.st_size,
-                      (time_t)0, (uint16_t)0);
+      rc= memcached_set(memc, ptr, strlen(ptr),
+                        file_buffer_ptr, sbuf.st_size,
+                        opt_expires, opt_flags);
+
+    if (rc != MEMCACHED_SUCCESS)
+      fprintf(stderr, "memcp: %s: memcache error %s\n", 
+	      ptr, memcached_strerror(memc, rc));
 
-    munmap(mptr, sbuf.st_size);
+    WATCHPOINT;
+    free(file_buffer_ptr);
     close(fd);
+    optind++;
   }
 
   memcached_deinit(memc);
 
+  free(opt_servers);
+
   return 0;
-};
+}
+
+void options_parse(int argc, char *argv[])
+{
+  int option_index= 0;
+  int option_rv;
+
+  static struct option long_options[]=
+    {
+      {"version", no_argument, NULL, OPT_VERSION},
+      {"help", no_argument, NULL, OPT_HELP},
+      {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
+      {"debug", no_argument, &opt_verbose, OPT_DEBUG},
+      {"servers", required_argument, NULL, OPT_SERVERS},
+      {"flag", required_argument, NULL, OPT_FLAG},
+      {"expire", required_argument, NULL, OPT_EXPIRE},
+      {"set",  no_argument, NULL, OPT_SET},
+      {"add",  no_argument, NULL, OPT_ADD},
+      {"replace",  no_argument, NULL, OPT_REPLACE},
+      {0, 0, 0, 0},
+    };
+
+  while (1) 
+  {
+    option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
+
+    if (option_rv == -1) break;
+
+    switch (option_rv)
+    {
+    case 0:
+      break;
+    case OPT_VERSION: /* --version or -V */
+      printf("memcache tools, memcp, v1.0\n");
+      exit(0);
+    case OPT_HELP: /* --help or -h */
+      printf("useful help messages go here\n");
+      exit(0);
+    case OPT_SERVERS: /* --servers or -s */
+      opt_servers= strdup(optarg);
+      break;
+    case OPT_FLAG: /* --flag */
+      opt_flags= (uint16_t)strtol(optarg, (char **)NULL, 16);
+      break;
+    case OPT_EXPIRE: /* --expire */
+      opt_expires= (time_t)strtoll(optarg, (char **)NULL, 10);
+      break;
+    case OPT_SET:
+      opt_method= OPT_SET;
+      break;
+    case OPT_REPLACE:
+      opt_method= OPT_REPLACE;
+      break;
+    case OPT_ADD:
+      opt_method= OPT_ADD;
+      break;
+    case '?':
+      /* getopt_long already printed an error message. */
+      exit(1);
+    default:
+      abort();
+    }
+  }
+}