projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for release.
[awesomized/libmemcached]
/
clients
/
memcp.cc
diff --git
a/clients/memcp.cc
b/clients/memcp.cc
index c56a79cdb7eff4109cb0247424b065e8f9a7c577..7ae5a1f300126469239f22578f169fd3ea916f22 100644
(file)
--- a/
clients/memcp.cc
+++ b/
clients/memcp.cc
@@
-1,4
+1,5
@@
/* LibMemcached
/* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker
* All rights reserved.
*
* Copyright (C) 2006-2009 Brian Aker
* All rights reserved.
*
@@
-9,7
+10,7
@@
*
*/
*
*/
-#include "config.h"
+#include "
mem_
config.h"
#include <cerrno>
#include <climits>
#include <cerrno>
#include <climits>
@@
-30,7
+31,7
@@
#include <unistd.h>
#include <unistd.h>
-#include <libmemcached/memcached.h>
+#include <libmemcached
-1.0
/memcached.h>
#include "client_options.h"
#include "utilities.h"
#include "client_options.h"
#include "utilities.h"
@@
-128,21
+129,23
@@
int main(int argc, char *argv[])
{
opt_servers= strdup(temp);
}
{
opt_servers= strdup(temp);
}
- else
+ else if (argc >= 1 and argv[--argc])
+ {
+ opt_servers= strdup(argv[--argc]);
+ }
+
+ if (opt_servers == NULL)
{
std::cerr << "No Servers provided" << std::endl;
exit(EXIT_FAILURE);
}
}
{
std::cerr << "No Servers provided" << std::endl;
exit(EXIT_FAILURE);
}
}
- memcached_server_st *servers;
- if (opt_servers)
- {
- servers= memcached_servers_parse(opt_servers);
- }
- else
+ memcached_server_st* servers= memcached_servers_parse(opt_servers);
+ if (servers == NULL or memcached_server_list_count(servers) == 0)
{
{
- servers= memcached_servers_parse(argv[--argc]);
+ std::cerr << "Invalid server list provided:" << opt_servers << std::endl;
+ return EXIT_FAILURE;
}
memcached_server_push(memc, servers);
}
memcached_server_push(memc, servers);
@@
-249,6
+252,7
@@
int main(int argc, char *argv[])
if (memcached_failed(rc))
{
std::cerr << "Error occrrured during memcached_set(): " << memcached_last_error_message(memc) << std::endl;
if (memcached_failed(rc))
{
std::cerr << "Error occrrured during memcached_set(): " << memcached_last_error_message(memc) << std::endl;
+ ::close(fd);
exit_code= EXIT_FAILURE;
}
exit_code= EXIT_FAILURE;
}