projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Kevin's patch bug13
[m6w6/libmemcached]
/
src
/
memcp.c
diff --git
a/src/memcp.c
b/src/memcp.c
index f51c93cb16281fa649dc406e28c0b5ffc805d35e..57d0a70da61282d5207b12c0e34d7f17db35c2b6 100644
(file)
--- a/
src/memcp.c
+++ b/
src/memcp.c
@@
-1,4
+1,6
@@
#include <stdio.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
#include <unistd.h>
#include <getopt.h>
#include <sys/types.h>
#include <unistd.h>
#include <getopt.h>
#include <sys/types.h>
@@
-7,6
+9,8
@@
#include <fcntl.h>
#include <errno.h>
#include <strings.h>
#include <fcntl.h>
#include <errno.h>
#include <strings.h>
+#include <string.h>
+#include <assert.h>
#include <memcached.h>
#include "client_options.h"
#include <memcached.h>
#include "client_options.h"
@@
-20,8
+24,9
@@
void options_parse(int argc, char *argv[]);
static int opt_verbose= 0;
static char *opt_servers= NULL;
static int opt_verbose= 0;
static char *opt_servers= NULL;
+static char *opt_hash= NULL;
static int opt_method= OPT_SET;
static int opt_method= OPT_SET;
-static uint
16
_t opt_flags= 0;
+static uint
32
_t opt_flags= 0;
static time_t opt_expires= 0;
int main(int argc, char *argv[])
static time_t opt_expires= 0;
int main(int argc, char *argv[])
@@
-33,6
+38,7
@@
int main(int argc, char *argv[])
options_parse(argc, argv);
memc= memcached_create(NULL);
options_parse(argc, argv);
memc= memcached_create(NULL);
+ process_hash_option(memc, opt_hash);
if (!opt_servers)
{
if (!opt_servers)
{
@@
-112,8
+118,13
@@
int main(int argc, char *argv[])
opt_expires, opt_flags);
if (rc != MEMCACHED_SUCCESS)
opt_expires, opt_flags);
if (rc != MEMCACHED_SUCCESS)
- fprintf(stderr, "memcp: %s: memcache error %s\n",
+ {
+ fprintf(stderr, "memcp: %s: memcache error %s",
ptr, memcached_strerror(memc, rc));
ptr, memcached_strerror(memc, rc));
+ if (memc->cached_errno)
+ fprintf(stderr, " system error %s", strerror(memc->cached_errno));
+ fprintf(stderr, "\n");
+ }
free(file_buffer_ptr);
close(fd);
free(file_buffer_ptr);
close(fd);
@@
-122,7
+133,10
@@
int main(int argc, char *argv[])
memcached_free(memc);
memcached_free(memc);
- free(opt_servers);
+ if (opt_servers)
+ free(opt_servers);
+ if (opt_hash)
+ free(opt_hash);
return 0;
}
return 0;
}
@@
-149,6
+163,7
@@
void options_parse(int argc, char *argv[])
{"set", no_argument, NULL, OPT_SET},
{"add", no_argument, NULL, OPT_ADD},
{"replace", no_argument, NULL, OPT_REPLACE},
{"set", no_argument, NULL, OPT_SET},
{"add", no_argument, NULL, OPT_ADD},
{"replace", no_argument, NULL, OPT_REPLACE},
+ {"hash", required_argument, NULL, OPT_HASH},
{0, 0, 0, 0},
};
{0, 0, 0, 0},
};
@@
-178,7
+193,7
@@
void options_parse(int argc, char *argv[])
opt_servers= strdup(optarg);
break;
case OPT_FLAG: /* --flag */
opt_servers= strdup(optarg);
break;
case OPT_FLAG: /* --flag */
- opt_flags= (uint
16
_t)strtol(optarg, (char **)NULL, 16);
+ opt_flags= (uint
32
_t)strtol(optarg, (char **)NULL, 16);
break;
case OPT_EXPIRE: /* --expire */
opt_expires= (time_t)strtoll(optarg, (char **)NULL, 10);
break;
case OPT_EXPIRE: /* --expire */
opt_expires= (time_t)strtoll(optarg, (char **)NULL, 10);
@@
-191,6
+206,8
@@
void options_parse(int argc, char *argv[])
break;
case OPT_ADD:
opt_method= OPT_ADD;
break;
case OPT_ADD:
opt_method= OPT_ADD;
+ case OPT_HASH:
+ opt_hash= strdup(optarg);
break;
case '?':
/* getopt_long already printed an error message. */
break;
case '?':
/* getopt_long already printed an error message. */