X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=clients%2Fmemcat.c;h=a25bc12c9f5c6f3fa60d6ad96a0b59c524b005bc;hb=d227f2a06b136be62333f220b80226c0ec1a472f;hp=f5f7f8f911d28b2bd5cf4dfeca5c4690e34af021;hpb=a4456cc10079f2e6f648befc91657f2723c825e5;p=m6w6%2Flibmemcached

diff --git a/clients/memcat.c b/clients/memcat.c
index f5f7f8f9..a25bc12c 100644
--- a/clients/memcat.c
+++ b/clients/memcat.c
@@ -31,6 +31,9 @@ static int opt_verbose= 0;
 static int opt_displayflag= 0;
 static char *opt_servers= NULL;
 static char *opt_hash= NULL;
+static char *opt_username;
+static char *opt_passwd;
+static char *opt_file;
 
 int main(int argc, char *argv[])
 {
@@ -68,11 +71,17 @@ int main(int argc, char *argv[])
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
                          (uint64_t)opt_binary);
 
-  while (optind < argc) 
+  if (!initialize_sasl(memc, opt_username, opt_passwd))
+  {
+    memcached_free(memc);
+    return 1;
+  }
+
+  while (optind < argc)
   {
     string= memcached_get(memc, argv[optind], strlen(argv[optind]),
                           &string_length, &flags, &rc);
-    if (rc == MEMCACHED_SUCCESS) 
+    if (rc == MEMCACHED_SUCCESS)
     {
       if (opt_displayflag)
       {
@@ -80,18 +89,44 @@ int main(int argc, char *argv[])
           printf("key: %s\nflags: ", argv[optind]);
         printf("%x\n", flags);
       }
-      else 
+      else
       {
         if (opt_verbose)
           printf("key: %s\nflags: %x\nlength: %zu\nvalue: ",
                  argv[optind], flags, string_length);
-        printf("%.*s\n", (int)string_length, string);
+        if (opt_file) {
+            FILE *fp;
+            size_t written = 0;
+
+            fp = fopen(opt_file, "w");
+            if (!fp) {
+                perror("fopen");
+                return_code= -1;
+                break;
+            }
+
+            written = fwrite(string, 1, string_length, fp);
+            if (written != string_length) {
+                fprintf(stderr, "error writing file (written %d, should be %d)\n", written, string_length);
+                return_code= -1;
+                break;
+            }
+
+            if (fclose(fp)) {
+                fprintf(stderr, "error closing file\n");
+                return_code= -1;
+                break;
+            }
+        }
+        else {
+            printf("%.*s\n", (int)string_length, string);
+        }
         free(string);
       }
     }
     else if (rc != MEMCACHED_NOTFOUND)
     {
-      fprintf(stderr, "memcat: %s: memcache error %s", 
+      fprintf(stderr, "memcat: %s: memcache error %s",
               argv[optind], memcached_strerror(memc, rc));
       if (memc->cached_errno)
 	fprintf(stderr, " system error %s", strerror(memc->cached_errno));
@@ -115,6 +150,8 @@ int main(int argc, char *argv[])
   if (opt_hash)
     free(opt_hash);
 
+  shutdown_sasl();
+
   return return_code;
 }
 
@@ -139,10 +176,13 @@ void options_parse(int argc, char *argv[])
       {(OPTIONSTRING)"flag", no_argument, &opt_displayflag, OPT_FLAG},
       {(OPTIONSTRING)"hash", required_argument, NULL, OPT_HASH},
       {(OPTIONSTRING)"binary", no_argument, NULL, OPT_BINARY},
+      {(OPTIONSTRING)"username", required_argument, NULL, OPT_USERNAME},
+      {(OPTIONSTRING)"password", required_argument, NULL, OPT_PASSWD},
+      {(OPTIONSTRING)"file", required_argument, NULL, OPT_FILE},
       {0, 0, 0, 0},
     };
 
-  while (1) 
+  while (1)
   {
     option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
     if (option_rv == -1) break;
@@ -171,6 +211,15 @@ void options_parse(int argc, char *argv[])
     case OPT_HASH:
       opt_hash= strdup(optarg);
       break;
+    case OPT_USERNAME:
+      opt_username= optarg;
+      break;
+    case OPT_PASSWD:
+      opt_passwd= optarg;
+      break;
+    case OPT_FILE:
+      opt_file= optarg;
+      break;
     case '?':
       /* getopt_long already printed an error message. */
       exit(1);