[uim] r6742 committed - * uim/uim-posix.c...

[codesite-noreply]

Revision: 6742
Author: ek.kato
Date: Tue Sep  7 21:56:43 2010
Log: * uim/uim-posix.c
  - (uim_check_dir_internal)
    - New.
    - Moved from uim_check_dir mostly.
    - Add check for whether to create the path.
  - (uim_check_dir)
    - Call uim_check_dir_internal.
    - Should rename this function later.
  - (c_prepare_dir)
    -  Rename from c_check_dir.
  - (c_check_dir)
    -  Rename to c_prepare_dir.
  - (uim_get_config_path_internal)
    - New.
    - Moved from uim_get_config_path.
    - Use uim_check_dir_internal.
  - (uim_get_config_path)
    - Call uim_get_config_path_internal.
  - (c_prepare_config_path)
    -  New.
  - (c_get_config_path)
    - Use uim_get_config_path_internal.
    - Change to not to create the dir when the path isn't existed.
  - (uim_init_posix_subrs)
    - Add "get-config-path" procedure for scheme side.
    - Follow the rename of c_check_dir and c_get_config_path.
http://code.google.com/p/uim/source/detail?r=6742

Modified:
 /trunk/uim/uim-posix.c

=======================================
--- /trunk/uim/uim-posix.c      Sun Apr  4 20:35:54 2010
+++ /trunk/uim/uim-posix.c      Tue Sep  7 21:56:43 2010
@@ -141,21 +141,33 @@
   return MAKE_STR(home);
 }

-uim_bool
-uim_check_dir(const char *dir)
+static uim_bool
+uim_check_dir_internal(const char *dir, int need_prepare)
 {
   struct stat st;

   if (stat(dir, &st) < 0)
-    return (mkdir(dir, 0700) < 0) ? UIM_FALSE : UIM_TRUE;
+    if (need_prepare)
+      return (mkdir(dir, 0700) < 0) ? UIM_FALSE : UIM_TRUE;
+    else
+      return UIM_FALSE;
   else {
     mode_t mode = S_IFDIR | S_IRUSR | S_IWUSR | S_IXUSR;
     return ((st.st_mode & mode) == mode) ? UIM_TRUE : UIM_FALSE;
   }
 }
+
+/* FIXME: use appropriate name for this API */
+uim_bool
+uim_check_dir(const char *dir)
+{
+  int need_prepare = UIM_TRUE;
+
+  return uim_check_dir_internal(dir, need_prepare);
+}

 static uim_lisp
-c_check_dir(uim_lisp dir_)
+c_prepare_dir(uim_lisp dir_)
 {
   if (!uim_check_dir(REFER_C_STR(dir_))) {
     return uim_scm_f();
@@ -163,8 +175,8 @@
   return uim_scm_t();
 }

-uim_bool
-uim_get_config_path(char *path, int len, int is_getenv)
+static uim_bool
+uim_get_config_path_internal(char *path, int len, int is_getenv, int  
need_prepare)
 {
   char home[MAXPATHLEN];

@@ -184,19 +196,40 @@
   if (snprintf(path, len, "%s/.uim.d", home) == -1)
     return UIM_FALSE;

-  if (!uim_check_dir(path)) {
+  if (!uim_check_dir_internal(path, need_prepare)) {
     return UIM_FALSE;
   }

   return UIM_TRUE;
 }
+
+/* FIXME: use appropriate name for this API */
+uim_bool
+uim_get_config_path(char *path, int len, int is_getenv)
+{
+  int need_prepare = UIM_TRUE;
+
+  return uim_get_config_path_internal(path, len, is_getenv, need_prepare);
+}
+
+static uim_lisp
+c_prepare_config_path(uim_lisp is_getenv_)
+{
+  char path[MAXPATHLEN];
+  int need_prepare = UIM_TRUE;
+
+  if (!uim_get_config_path_internal(path, sizeof(path),  
C_BOOL(is_getenv_), need_prepare))
+    return uim_scm_f();
+  return MAKE_STR(path);
+}

 static uim_lisp
 c_get_config_path(uim_lisp is_getenv_)
 {
   char path[MAXPATHLEN];
-
-  if (!uim_get_config_path(path, sizeof(path), C_BOOL(is_getenv_)))
+  int need_prepare = UIM_FALSE;
+
+  if (!uim_get_config_path_internal(path, sizeof(path),  
C_BOOL(is_getenv_), need_prepare))
     return uim_scm_f();
   return MAKE_STR(path);
 }
@@ -391,8 +424,9 @@
   uim_scm_init_proc0("user-name", user_name);
   uim_scm_init_proc1("home-directory", home_directory);

-  uim_scm_init_proc1("create/check-directory!", c_check_dir);
-  uim_scm_init_proc1("get-config-path!", c_get_config_path);
+  uim_scm_init_proc1("create/check-directory!", c_prepare_dir);
+  uim_scm_init_proc1("get-config-path!", c_prepare_config_path);
+  uim_scm_init_proc1("get-config-path", c_get_config_path);

   uim_scm_init_proc1("file-readable?", file_readablep);
   uim_scm_init_proc1("file-writable?", file_writablep);