default_file_mode -> file_default_mode

default_directory_mode -> directory_default_mode

move definitions from basic.cf to file.cf.

13 files changed, 168 insertions, 122 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index 9983c9b8..10b22373 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -221,8 +221,6 @@ unsubscribe_command {
 default {
 
    default_* {
-    ?     $default_directory_mode
-    ?     $default_file_mode
           $default_mail_body_size_limit
           $default_mail_header_size_limit
     ?     $default_umask
@@ -255,6 +253,7 @@ digest {
 directory {
 
    directory_* {
+    ?     $directory_default_mode
     ?     $directory_private_mode
     ?     $directory_public_mode
    }
@@ -675,6 +674,7 @@ _dir$ {
     ?     $commands_for_privileged_user
     ?     $commands_for_stranger
     ?     $commands_for_user
+    ?     $file_default_mode
     ?     $list_addresses
     ?     $unsafe_header_fields
 </screen>
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index 56d15a4e..d40b26f3 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -449,24 +449,6 @@ $var_dir/db
 </row>
 <row>
 <entry>
-default_directory_mode</entry>
-<entry>
- default mode in mkdir</entry>
-<entry>
-0755
-   </entry>
-</row>
-<row>
-<entry>
-default_file_mode</entry>
-<entry>
- default mode in creating file</entry>
-<entry>
-0600
-   </entry>
-</row>
-<row>
-<entry>
 default_mail_body_size_limit</entry>
 <entry>
  body size limit</entry>
@@ -522,6 +504,15 @@ $ml_home_dir/seq-digest
 </row>
 <row>
 <entry>
+directory_default_mode</entry>
+<entry>
+ default mode in creating directory.</entry>
+<entry>
+0755
+   </entry>
+</row>
+<row>
+<entry>
 domain_config_base_dir</entry>
 <entry>
  system data directory provided by fml</entry>
@@ -685,6 +676,15 @@ $var_dir/event/queue
 </row>
 <row>
 <entry>
+file_default_mode</entry>
+<entry>
+ default mode in creating file</entry>
+<entry>
+0600
+   </entry>
+</row>
+<row>
+<entry>
 get_command_request_limit</entry>
 <entry>
  maximu number of request in get command(s) in one mail.</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 9983c9b8..d4913410 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -221,8 +221,6 @@ unsubscribe_command {
 default {
 
    default_* {
-    ?     $default_directory_mode
-    ?     $default_file_mode
           $default_mail_body_size_limit
           $default_mail_header_size_limit
     ?     $default_umask
@@ -255,6 +253,7 @@ digest {
 directory {
 
    directory_* {
+    ?     $directory_default_mode
     ?     $directory_private_mode
     ?     $directory_public_mode
    }
@@ -675,7 +674,9 @@ _dir$ {
     ?     $commands_for_privileged_user
     ?     $commands_for_stranger
     ?     $commands_for_user
+    ?     $file_default_mode
     ?     $list_addresses
+    ?     $n
     ?     $unsafe_header_fields
 </screen>
 </para>
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 00599847..19cb6b45 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -431,24 +431,6 @@ $var_dir/db
 </row>
 <row>
 <entry>
-default_directory_mode</entry>
-<entry>
- ディレクトリを作成する時のデフォルトモード</entry>
-<entry>
-0755
-   </entry>
-</row>
-<row>
-<entry>
-default_file_mode</entry>
-<entry>
- ファイルを作成する時のデフォルトモード</entry>
-<entry>
-0600
-   </entry>
-</row>
-<row>
-<entry>
 default_mail_body_size_limit</entry>
 <entry>
  本文サイズの上限のデフォルト値</entry>
@@ -504,6 +486,15 @@ $ml_home_dir/seq-digest
 </row>
 <row>
 <entry>
+directory_default_mode</entry>
+<entry>
+ ディレクトリを作成する時のデフォルトモード</entry>
+<entry>
+0755
+   </entry>
+</row>
+<row>
+<entry>
 domain_config_base_dir</entry>
 <entry>
  fml からシステムに教えるデータを置くためのディレクトリ</entry>
@@ -667,6 +658,15 @@ $var_dir/event/queue
 </row>
 <row>
 <entry>
+file_default_mode</entry>
+<entry>
+ ファイルを作成する時のデフォルトモード</entry>
+<entry>
+0600
+   </entry>
+</row>
+<row>
+<entry>
 get_command_request_limit</entry>
 <entry>
  get コマンドで指定できる記事数の上限。</entry>
diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index eb5ed0ee..37bedcc9 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -70,45 +70,47 @@
 maintainer	=
 
 
-=head2	default modes
+=head2	default umask
 
 
-# Descriptions: default mode in creating file
+# Descriptions:
 #      History:
 #        Value:
 #     Examples:
-default_file_mode	=	0600
+default_umask		=	077
+
+
+=head2 TIME ZONE
 
 
-# Descriptions: default mode in mkdir
+# Descriptions:
 #      History:
 #        Value:
 #     Examples:
-default_directory_mode	=	0755
-
+timezone		=	+0900
 
-directory_public_mode	=	0755
+=head1	directory
 
-directory_private_mode	=	0700
+=head2	mode
 
+# Descriptions: default mode in creating directory.
+#      History:
+#        Value:
+#     Examples:
+directory_default_mode	=	0755
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-default_umask		=	077
-
-
-=head2 TIME ZONE
-
+directory_public_mode	=	0755
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-timezone		=	+0900
+directory_private_mode	=	0700
 
-=head1	directory
 
 =head2 directories "makefml newml" initializes 
 
@@ -252,6 +254,15 @@ event_queue_dir	= $var_dir/event/queue
 
 =head1	file
 
+=head2	mode
+
+
+# Descriptions: default mode in creating file
+#      History:
+#        Value:
+#     Examples:
+file_default_mode	=	0600
+
 
 =head1	ACL
 
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 39946b57..26698bfe 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -55,7 +55,7 @@
 #   http://www.fml.org/software/fml-devel/Documentation/ja/tutorial/
 # の「プログラミングスタイル」の章を御覧ください。
 #
-=head1	基本的なパラメータ
+n=head1	基本的なパラメータ
 
 =head2	ＭＬの管理者
 
@@ -66,51 +66,54 @@
 maintainer	=
 
 
-=head2	default modes
+=head2	default umask
 
 
-# Descriptions: ファイルを作成する時のデフォルトモード
+# Descriptions:
 #      History:
 #        Value:
 #     Examples:
-default_file_mode	=	0600
+default_umask		=	077
 
 
-# Descriptions: ディレクトリを作成する時のデフォルトモード
+=head2 TIME ZONE
+
+
+# Descriptions:
 #      History:
 #        Value:
 #     Examples:
-default_directory_mode	=	0755
+timezone		=	+0900
+
 
 
+
+
+
+
+
+=head1	ディレクトリ
+
+=head2	mode
+
 # Descriptions: ディレクトリを作成する時のデフォルトモード
 #      History:
 #        Value:
 #     Examples:
-default_directory_mode	=	0755
-
-directory_public_mode	=	0755
-
-directory_private_mode	=	0700
-
+directory_default_mode	=	0755
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-default_umask		=	077
-
-
-=head2 TIME ZONE
-
+directory_public_mode	=	0755
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-timezone		=	+0900
+directory_private_mode	=	0700
 
-=head1	ディレクトリ
 
 =head2 newml で初期化する
 
@@ -260,6 +263,15 @@ event_queue_dir	= $var_dir/event/queue
 
 =head1	ファイル
 
+=head2 	mode
+
+
+# Descriptions: ファイルを作成する時のデフォルトモード
+#      History:
+#        Value:
+#     Examples:
+file_default_mode	=	0600
+
 
 =head1	アクセス制御ルール
 
diff --git a/fml/etc/src/config.cf.en/basic.cf b/fml/etc/src/config.cf.en/basic.cf
index 762fe60b..0b19b070 100644
--- a/fml/etc/src/config.cf.en/basic.cf
+++ b/fml/etc/src/config.cf.en/basic.cf
@@ -9,26 +9,7 @@
 maintainer	=
 
 
-=head2	default modes
-
-
-# Descriptions: default mode in creating file
-#      History:
-#        Value:
-#     Examples:
-default_file_mode	=	0600
-
-# Descriptions:
-#      History:
-#        Value:
-#     Examples:
-directory_public_mode	=	0755
-
-# Descriptions:
-#      History:
-#        Value:
-#     Examples:
-directory_private_mode	=	0700
+=head2	default umask
 
 
 # Descriptions:
diff --git a/fml/etc/src/config.cf.en/directory.cf b/fml/etc/src/config.cf.en/directory.cf
index fb6f5edf..c801a743 100644
--- a/fml/etc/src/config.cf.en/directory.cf
+++ b/fml/etc/src/config.cf.en/directory.cf
@@ -1,5 +1,26 @@
 =head1	directory
 
+=head2	mode
+
+# Descriptions: default mode in creating directory.
+#      History:
+#        Value:
+#     Examples:
+directory_default_mode	=	0755
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+directory_public_mode	=	0755
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+directory_private_mode	=	0700
+
+
 =head2 directories "makefml newml" initializes 
 
 
diff --git a/fml/etc/src/config.cf.en/file.cf b/fml/etc/src/config.cf.en/file.cf
index d84a903b..d88557d8 100644
--- a/fml/etc/src/config.cf.en/file.cf
+++ b/fml/etc/src/config.cf.en/file.cf
@@ -1,2 +1,11 @@
 =head1	file
 
+=head2	mode
+
+
+# Descriptions: default mode in creating file
+#      History:
+#        Value:
+#     Examples:
+file_default_mode	=	0600
+
diff --git a/fml/etc/src/config.cf.ja/basic.cf b/fml/etc/src/config.cf.ja/basic.cf
index 368acf69..68178be3 100644
--- a/fml/etc/src/config.cf.ja/basic.cf
+++ b/fml/etc/src/config.cf.ja/basic.cf
@@ -1,4 +1,4 @@
-=head1	基本的なパラメータ
+n=head1	基本的なパラメータ
 
 =head2	ＭＬの管理者
 
@@ -9,47 +9,28 @@
 maintainer	=
 
 
-=head2	default modes
+=head2	default umask
 
 
-# Descriptions: ファイルを作成する時のデフォルトモード
+# Descriptions:
 #      History:
 #        Value:
 #     Examples:
-default_file_mode	=	0600
+default_umask		=	077
 
 
-# Descriptions: ディレクトリを作成する時のデフォルトモード
-#      History:
-#        Value:
-#     Examples:
-default_directory_mode	=	0755
+=head2 TIME ZONE
 
-# Descriptions:
-#      History:
-#        Value:
-#     Examples:
-directory_public_mode	=	0755
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-directory_private_mode	=	0700
+timezone		=	+0900
+
 
 
-# Descriptions:
-#      History:
-#        Value:
-#     Examples:
-default_umask		=	077
 
 
-=head2 TIME ZONE
 
 
-# Descriptions:
-#      History:
-#        Value:
-#     Examples:
-timezone		=	+0900
diff --git a/fml/etc/src/config.cf.ja/directory.cf b/fml/etc/src/config.cf.ja/directory.cf
index 665940fb..1e8738fa 100644
--- a/fml/etc/src/config.cf.ja/directory.cf
+++ b/fml/etc/src/config.cf.ja/directory.cf
@@ -1,5 +1,26 @@
 =head1	ディレクトリ
 
+=head2	mode
+
+# Descriptions: ディレクトリを作成する時のデフォルトモード
+#      History:
+#        Value:
+#     Examples:
+directory_default_mode	=	0755
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+directory_public_mode	=	0755
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+directory_private_mode	=	0700
+
+
 =head2 newml で初期化する
 
 
diff --git a/fml/etc/src/config.cf.ja/file.cf b/fml/etc/src/config.cf.ja/file.cf
index dd9473cd..26768a62 100644
--- a/fml/etc/src/config.cf.ja/file.cf
+++ b/fml/etc/src/config.cf.ja/file.cf
@@ -1,2 +1,11 @@
 =head1	ファイル
 
+=head2 	mode
+
+
+# Descriptions: ファイルを作成する時のデフォルトモード
+#      History:
+#        Value:
+#     Examples:
+file_default_mode	=	0600
+
diff --git a/fml/lib/FML/Process/Utils.pm b/fml/lib/FML/Process/Utils.pm
index 0773def5..54af9117 100644
--- a/fml/lib/FML/Process/Utils.pm
+++ b/fml/lib/FML/Process/Utils.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Utils.pm,v 1.88 2003/10/16 03:50:07 fukachan Exp $
+# $FML: Utils.pm,v 1.89 2003/10/16 14:05:26 fukachan Exp $
 #
 
 package FML::Process::Utils;
@@ -280,7 +280,7 @@ sub mkdir
 {
     my ($curproc, $dir, $mode) = @_;
     my $config  = $curproc->config();
-    my $dirmode = $config->{ default_directory_mode } || '0700';
+    my $dirmode = $config->{ directory_default_mode } || '0700';
 
     # back up umask
     my $curmask = umask( 077 ); # full open for readability