X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions.cc;h=290cfc895b434c90868563ae37476237454dca84;hb=7287f37372f5e4198f7f16f5f6d6dcf9a8d5c1fb;hp=fefcb57dc1d81ef64923d38e3fdefcd73de2dce8;hpb=16c2fe9cc04a3f15fe56d3be2f3be19a1d731fb2;p=m6w6%2Flibmemcached

diff --git a/libmemcached/options.cc b/libmemcached/options.cc
index fefcb57d..290cfc89 100644
--- a/libmemcached/options.cc
+++ b/libmemcached/options.cc
@@ -35,75 +35,151 @@
  *
  */
 
-#include "common.h"
+#include <libmemcached/common.h>
+#include <libmemcached/options.hpp>
 
-#include <libmemcached/options/parser.h>
-#include <libmemcached/options/scanner.h>
+#include <libmemcached/csl/context.h>
 
-int libmemcached_parse(type_st *, yyscan_t *);
+const char *memcached_parse_filename(memcached_st *memc)
+{
+  assert_msg(memc, "Invalid memcached_st");
+  return memcached_array_string(memc->configure.filename);
+}
 
-memcached_return_t memcached_check_options(const char *option_string, size_t length, const char *error_buffer, size_t error_buffer_size)
+size_t memcached_parse_filename_length(memcached_st *memc)
 {
-  memcached_st memc;
-  if (! memcached_create(&memc))
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+  return memcached_array_size(memc->configure.filename);
+}
 
-  memcached_return_t rc= memcached_parse_options(&memc, option_string, length);
-  if (rc != MEMCACHED_SUCCESS && error_buffer && error_buffer_size)
+static memcached_return_t _parse_file_options(memcached_st& self, memcached_array_st *real_name)
+{
+  FILE *fp= fopen(memcached_array_string(real_name), "r");
+  if (not fp)
   {
-    strncpy(error_buffer, error_buffer_size, memcached_last_error_message(&memc));
+    memcached_string_t error_message= memcached_array_to_string(real_name);
+    memcached_return_t rc=  memcached_set_errno(self, errno, MEMCACHED_AT, error_message);
+    return rc;
   }
 
-  memcached_free(&memc);
+  char buffer[BUFSIZ];
+  memcached_return_t rc= MEMCACHED_INVALID_ARGUMENTS;
+  while (fgets(buffer, sizeof(buffer), fp))
+  {
+    size_t length= strlen(buffer);
+    
+    if (length == 1 and buffer[0] == '\n')
+      continue;
+
+    if (memcached_failed(rc= memcached_parse_configuration(&self, buffer, length)))
+      break;
+  }
+  fclose(fp);
 
   return rc;
 }
 
-memcached_return_t memcached_parse_options(memcached_st *self, char const *option_string, size_t length)
+memcached_return_t libmemcached_check_configuration(const char *option_string, size_t length, char *error_buffer, size_t error_buffer_size)
 {
-  type_st pp;
+  memcached_st memc, *memc_ptr;
+
+  if (option_string == NULL or length == 0)
+  {
+    return MEMCACHED_INVALID_ARGUMENTS;
+  }
+
+  if (error_buffer and error_buffer_size)
+  {
+    error_buffer[0]= 0;
+  }
+
+  if (not (memc_ptr= memcached_create(&memc)))
+  {
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+  }
+
+  memcached_return_t rc= memcached_parse_configuration(memc_ptr, option_string, length);
+  if (memcached_failed(rc) and error_buffer and error_buffer_size)
+  {
+    strncpy(error_buffer, memcached_last_error_message(memc_ptr), error_buffer_size);
+    error_buffer[error_buffer_size -1]= 0;
+  }
+
+  bool has_filename= memcached_behavior_get(memc_ptr, MEMCACHED_BEHAVIOR_LOAD_FROM_FILE);
+  if (memcached_success(rc) and has_filename)
+  {
+    assert_msg(memcached_parse_filename(memc_ptr), "Invalid configuration file");
+    assert_msg(memcached_parse_filename_length(memc_ptr), "Invalid configuration file");
+    rc= _parse_file_options(*memc_ptr, memc_ptr->configure.filename);
+
+    if (memcached_failed(rc) and error_buffer and error_buffer_size)
+    {
+      strncpy(error_buffer, memcached_last_error_message(memc_ptr), error_buffer_size);
+      error_buffer[error_buffer_size -1]= 0;
+    }
+  }
 
-  memset(&pp, 0, sizeof(type_st));
+  memcached_free(memc_ptr);
 
+  return rc;
+}
+
+memcached_return_t memcached_parse_configuration(memcached_st *self, char const *option_string, size_t length)
+{
   WATCHPOINT_ASSERT(self);
-  if (! self)
+  if (not self)
+  {
     return MEMCACHED_INVALID_ARGUMENTS;
+  }
 
-  pp.buf= option_string;
-  pp.memc= self;
-  pp.length= length;
-  libmemcached_lex_init(&pp.yyscanner);
-  libmemcached_set_extra(&pp, pp.yyscanner);
-  bool success= libmemcached_parse(&pp, pp.yyscanner)  == 0;
-  libmemcached_lex_destroy(pp.yyscanner);
+  memcached_return_t rc;
+  Context context(option_string, length, self, rc);
 
-  if (not success)
-    return memcached_set_error(self, MEMCACHED_PARSE_ERROR, NULL);
+  context.start();
 
-  return MEMCACHED_SUCCESS;
+  return rc;
 }
 
-memcached_return_t memcached_parse_file_options(memcached_st *self, const char *filename)
+void memcached_set_configuration_file(memcached_st *self, const char *filename, size_t filename_length)
 {
-  FILE *fp= fopen(filename, "r");
-  
-  if (! fp)
-    return memcached_set_errno(self, errno, NULL);
+  assert_msg(filename, "Invalid filename");
+  assert_msg(filename_length, "Invalid filename_length");
+  memcached_array_free(self->configure.filename);
+  self->configure.filename= memcached_strcpy(self, filename, filename_length);
+}
 
-  char buffer[BUFSIZ];
-  memcached_return_t rc= MEMCACHED_INVALID_ARGUMENTS;
-  while (fgets(buffer, sizeof(buffer), fp))
+memcached_return_t memcached_parse_configure_file(memcached_st& self, const char *filename, size_t length)
+{
+  if (not filename)
   {
-    size_t length= strlen(buffer);
-    
-    if (length == 1 and buffer[0] == '\n')
-      continue;
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
+  }
 
-    rc= memcached_parse_options(self, buffer, length);
-    if (rc != MEMCACHED_SUCCESS)
-      break;
+  WATCHPOINT_ASSERT(self);
+  if (not length)
+  {
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
   }
-  fclose(fp);
+
+  memcached_array_st *tmp_array= memcached_strcpy(&self, filename, length);
+
+  if (not tmp_array)
+  {
+    return memcached_set_error(self, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
+  }
+
+  memcached_return_t rc= memcached_parse_configure_file(self, *tmp_array);
+  memcached_array_free(tmp_array);
 
   return rc;
 }
+
+memcached_return_t memcached_parse_configure_file(memcached_st& self, memcached_array_st& filename)
+{
+  WATCHPOINT_ASSERT(memcached_array_size(&filename));
+  if (not memcached_array_size(&filename))
+  {
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
+  }
+
+  return _parse_file_options(self, &filename);
+}