X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemcp.c;h=0eb210a701c13dd45ec10c29ceeeba8bd31a877e;hb=064c0dc136f5a60f8aea4641e6dd68d3611a6a54;hp=3430ab54ad935be6815ef7b8dfc28ddd338f9c26;hpb=aadeadec9c2ca09c41a5dc2d63a34c465d39df3a;p=awesomized%2Flibmemcached

diff --git a/src/memcp.c b/src/memcp.c
index 3430ab54..0eb210a7 100644
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -1,92 +1,211 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-
-#include <memcached.h>
-
-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;
-
-  memc= memcached_init(NULL);
-
-  /* Get the server name */
-  {
-    char *ptr;
-    char *hostname;
-    size_t hostname_length;
-    unsigned int port;
-
-    ptr= index(argv[argc-1], ':');
-
-    if (ptr)
-    {
-      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++;
-
-      port= strtol(ptr, (char **)NULL, 10);
-
-      memcached_server_add(memc, hostname, port);
-      free(hostname);
-    }
-    else
-    {
-      memcached_server_add(memc, argv[argc -1], 0);
-    }
-  }
-
-  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)
-    {
-      fprintf(stderr, "Failed opening %s\n", argv[x]);
-      exit(1);
-    }
-
-    (void)fstat(fd, &sbuf);
-    mptr= mmap(NULL, sbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-
-    ptr= rindex(argv[x], '/');
-    if (ptr)
-    {
-      ptr++;
-    }
-    else
-    {
-      ptr= argv[x];
-    }
-    
-    rc= memcached_set(memc, ptr, strlen(ptr),
-                      mptr, sbuf.st_size,
-                      (time_t)0, (uint16_t)0);
-
-    munmap(mptr, sbuf.st_size);
-    close(fd);
-  }
-
-  memcached_deinit(memc);
-
-  return 0;
-};
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <strings.h>
+#include <string.h>
+#include <assert.h>
+
+#include <memcached.h>
+#include "client_options.h"
+#include "utilities.h"
+
+#define PROGRAM_NAME "memcp"
+#define PROGRAM_DESCRIPTION "Copy a set of files to a memcached cluster."
+
+/* 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;
+  memcached_return rc;
+  memcached_server_st *servers;
+
+  options_parse(argc, argv);
+
+  memc= memcached_create(NULL);
+
+  if (!opt_servers)
+  {
+    char *temp;
+
+    if ((temp= getenv("MEMCACHED_SERVERS")))
+      opt_servers= strdup(temp);
+    else
+      exit(1);
+  }
+
+  if (opt_servers)
+    servers= memcached_servers_parse(opt_servers);
+  else
+    servers= memcached_servers_parse(argv[--argc]);
+
+  memcached_server_push(memc, servers);
+  memcached_server_list_free(servers);
+
+  while (optind < argc) 
+  {
+    struct stat sbuf;
+    int fd;
+    char *ptr;
+    ssize_t read_length;
+    char *file_buffer_ptr;
+
+    fd= open(argv[optind], O_RDONLY);
+    if (fd < 0)
+    {
+      fprintf(stderr, "memcp: %s: %s\n", argv[optind], strerror(errno));
+      optind++;
+      continue;
+    }
+
+    (void)fstat(fd, &sbuf);
+
+    ptr= rindex(argv[optind], '/');
+    if (ptr)
+      ptr++;
+    else
+      ptr= argv[optind];
+
+    if (opt_verbose) 
+    {
+      static char *opstr[] = { "set", "add", "replace" };
+      printf("op: %s\nsource file: %s\nlength: %zu\n"
+	     "key: %s\nflags: %x\nexpires: %llu\n",
+	     opstr[opt_method - OPT_SET], argv[optind], (size_t)sbuf.st_size,
+	     ptr, opt_flags, (unsigned long long)opt_expires);
+    }
+
+    if ((file_buffer_ptr= (char *)malloc(sizeof(char) * sbuf.st_size)) == NULL)
+    {
+      fprintf(stderr, "malloc: %s\n", strerror(errno)); 
+      exit(1);
+    }
+
+    if ((read_length= read(fd, file_buffer_ptr, sbuf.st_size)) == -1)
+    {
+      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
+      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", 
+	      ptr, memcached_strerror(memc, rc));
+      if (memc->my_errno)
+	fprintf(stderr, " system error %s", strerror(memc->my_errno));
+      fprintf(stderr, "\n");
+    }
+
+    free(file_buffer_ptr);
+    close(fd);
+    optind++;
+  }
+
+  memcached_free(memc);
+
+  free(opt_servers);
+
+  return 0;
+}
+
+void options_parse(int argc, char *argv[])
+{
+  int option_index= 0;
+  int option_rv;
+
+  memcached_programs_help_st help_options[]=
+  {
+    {0},
+  };
+
+  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_VERBOSE: /* --verbose or -v */
+      opt_verbose = OPT_VERBOSE;
+      break;
+    case OPT_DEBUG: /* --debug or -d */
+      opt_verbose = OPT_DEBUG;
+      break;
+    case OPT_VERSION: /* --version or -V */
+      version_command(PROGRAM_NAME);
+      break;
+    case OPT_HELP: /* --help or -h */
+      help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, help_options);
+      break;
+    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();
+    }
+  }
+}