/* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker
* All rights reserved.
*
*
*/
-#include "config.h"
+#include "mem_config.h"
#include <cerrno>
#include <climits>
#include <unistd.h>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
#include "client_options.h"
#include "utilities.h"
{
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);
}
}
- 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);
if ((file_buffer_ptr= (char *)malloc(sizeof(char) * (size_t)sbuf.st_size)) == NULL)
{
std::cerr << "Error allocating file buffer(" << strerror(errno) << ")" << std::endl;
+ close(fd);
exit(EXIT_FAILURE);
}
if ((read_length= ::read(fd, file_buffer_ptr, (size_t)sbuf.st_size)) == -1)
{
std::cerr << "Error while reading file " << file_buffer_ptr << " (" << strerror(errno) << ")" << std::endl;
+ close(fd);
exit(EXIT_FAILURE);
}
if (read_length != sbuf.st_size)
{
std::cerr << "Failure while reading file. Read length was not equal to stat() length" << std::endl;
+ close(fd);
exit(EXIT_FAILURE);
}
if (memcached_failed(rc))
{
std::cerr << "Error occrrured during memcached_set(): " << memcached_last_error_message(memc) << std::endl;
+ ::close(fd);
exit_code= EXIT_FAILURE;
}