[uim-commit] r2953 - in trunk: doc scm uim

yamaken at freedesktop.org yamaken at freedesktop.org
Fri Jan 20 16:26:04 PST 2006


Author: yamaken
Date: 2006-01-20 16:26:02 -0800 (Fri, 20 Jan 2006)
New Revision: 2953

Modified:
   trunk/doc/COMPATIBILITY
   trunk/scm/custom-rt.scm
   trunk/scm/init.scm
   trunk/scm/plugin.scm
   trunk/scm/skk.scm
   trunk/uim/uim-util.c
Log:
* uim/uim-util.c
  - (is_setugidp, setugidp): Rename is_setugidp to setugidp
  - (uim_init_util_subrs):
    * Follow the function renaming
    * Rename Scheme procedure name is-set-ugid? to setugid?
* scm/init.scm
  - (load-user-conf): Follow the renaming
* scm/plugin.scm
  - (uim-plugin-lib-load-path, uim-plugin-scm-load-path,
    load-module-conf, load-enabled-modules): Ditto
* scm/skk.scm
  - (skk-read-personal-dictionary, skk-save-personal-dictionary):
    Ditto
* scm/custom-rt.scm
  - (require-custom, custom-reload-user-configs): Ditto
* doc/COMPATIBILITY
  - Add new section "Rename is-set-ugid? to follow the Scheme naming
    convention"


Modified: trunk/doc/COMPATIBILITY
===================================================================
--- trunk/doc/COMPATIBILITY	2006-01-20 23:55:58 UTC (rev 2952)
+++ trunk/doc/COMPATIBILITY	2006-01-21 00:26:02 UTC (rev 2953)
@@ -57,6 +57,23 @@
 
 The changes are described below in most recently updated order.
 ------------------------------------------------------------------------------
+Summary: Rename is-set-ugid? to follow the Scheme naming convention
+Affects: IM developers, uim developers
+Updates: Scheme API
+Version: 1.1.0
+Revision: ac2953
+Date: 2006-01-21
+Modifier: YamaKen
+Related:
+URL:
+Changes:
+ (removed) is-set-ugid?
+     (new) setugid?
+Description:
+  Ordinary Scheme predicate does not have 'is' prefix. And to indicate
+  its function similarity to the issetugid(3), the '_' separator
+  should be removed.
+------------------------------------------------------------------------------
 Summary: Hide unintentionally exposed is_setugid()
 Affects: uim developers
 Updates: C API

Modified: trunk/scm/custom-rt.scm
===================================================================
--- trunk/scm/custom-rt.scm	2006-01-20 23:55:58 UTC (rev 2952)
+++ trunk/scm/custom-rt.scm	2006-01-21 00:26:02 UTC (rev 2953)
@@ -113,7 +113,7 @@
       (let* ((post-groups (custom-list-primary-groups))
 	     (new-groups (list-tail post-groups (length pre-groups))))
 	(if (and (not (getenv "LIBUIM_VANILLA"))
-		 (not (is-set-ugid?)))
+		 (not (setugid?)))
 	    (for-each (lambda (gsym)
 			(custom-load-group-conf gsym)
 			(custom-update-group-conf-freshness gsym))
@@ -267,7 +267,7 @@
 (define custom-reload-user-configs
   (lambda ()
     (and (not (getenv "LIBUIM_VANILLA"))
-	 (not (is-set-ugid?))
+	 (not (setugid?))
 	 (let ((load-conf (if custom-enable-mtime-aware-user-conf-reloading?
 			      custom-load-updated-group-conf
 			      custom-load-group-conf)))  ;; original behavior

Modified: trunk/scm/init.scm
===================================================================
--- trunk/scm/init.scm	2006-01-20 23:55:58 UTC (rev 2952)
+++ trunk/scm/init.scm	2006-01-21 00:26:02 UTC (rev 2953)
@@ -48,7 +48,7 @@
 
 (define load-user-conf
   (lambda ()
-    (if (is-set-ugid?)
+    (if (setugid?)
 	#f
 	(let ((orig-verbose (verbose))
 	      (file (or (getenv "LIBUIM_USER_SCM_FILE")

Modified: trunk/scm/plugin.scm
===================================================================
--- trunk/scm/plugin.scm	2006-01-20 23:55:58 UTC (rev 2952)
+++ trunk/scm/plugin.scm	2006-01-21 00:26:02 UTC (rev 2953)
@@ -35,7 +35,7 @@
 (require "util.scm")
 
 (define uim-plugin-lib-load-path
-   (if (is-set-ugid?)
+   (if (setugid?)
        (list (string-append (sys-pkglibdir) "/plugin"))
        (filter string?
  	      (append (list (getenv "LIBUIM_PLUGIN_LIB_DIR")
@@ -47,7 +47,7 @@
  			  ())))))
 
 (define uim-plugin-scm-load-path
-  (if (is-set-ugid?)
+  (if (setugid?)
       (list (sys-pkgdatadir))
       (filter string?
  	      (list (getenv "LIBUIM_SCM_FILES")
@@ -125,7 +125,7 @@
 	   (conf-file "installed-modules.scm")
 	   (user-conf-file (string-append user-module-dir conf-file)))
       (try-load conf-file)
-      (if (is-set-ugid?)
+      (if (setugid?)
 	  #f
 	  (if (not (getenv "LIBUIM_VANILLA"))
 	      (let ((orig-module-list installed-im-module-list)
@@ -144,6 +144,6 @@
 	   (file "loader.scm")
 	   (user-file (string-append user-module-dir file)))
       (and (try-load file)
-	   (or (and (not (is-set-ugid?))
+	   (or (and (not (setugid?))
 		    (try-load user-file))
 	       #t)))))

Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2006-01-20 23:55:58 UTC (rev 2952)
+++ trunk/scm/skk.scm	2006-01-21 00:26:02 UTC (rev 2953)
@@ -336,13 +336,13 @@
 
 (define skk-read-personal-dictionary
   (lambda ()
-    (if (not (is-set-ugid?))
+    (if (not (setugid?))
 	(or (skk-lib-read-personal-dictionary skk-uim-personal-dic-filename)
 	    (skk-lib-read-personal-dictionary skk-personal-dic-filename)))))
 
 (define skk-save-personal-dictionary
   (lambda ()
-    (if (not (is-set-ugid?))
+    (if (not (setugid?))
 	(skk-lib-save-personal-dictionary skk-uim-personal-dic-filename))))
 
 (define skk-flush

Modified: trunk/uim/uim-util.c
===================================================================
--- trunk/uim/uim-util.c	2006-01-20 23:55:58 UTC (rev 2952)
+++ trunk/uim/uim-util.c	2006-01-21 00:26:02 UTC (rev 2953)
@@ -615,7 +615,7 @@
 }
 
 static uim_lisp
-is_setugidp(void)
+setugidp(void)
 {
   if (uim_issetugid()) {
     return uim_scm_t();
@@ -655,5 +655,5 @@
   uim_scm_init_subr_3("iterate-lists", iterate_lists);
   uim_scm_init_subr_2("find-tail", find_tail);
   uim_scm_init_subr_1("lang-code->lang-name-raw", lang_code_to_lang_name_raw);
-  uim_scm_init_subr_0("is-set-ugid?", is_setugidp);
+  uim_scm_init_subr_0("setugid?", setugidp);
 }



More information about the uim-commit mailing list