modified to use FML::Restriction::Base->regexp().

modify messages.

4 files changed, 20 insertions, 26 deletions

diff --git a/fml/lib/FML/Command/Admin/dir.pm b/fml/lib/FML/Command/Admin/dir.pm
index 3c1b229a..6b533ea1 100644
--- a/fml/lib/FML/Command/Admin/dir.pm
+++ b/fml/lib/FML/Command/Admin/dir.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2002 Ken'ichi Fukamachi
+#  Copyright (C) 2002,2003 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: dir.pm,v 1.7 2002/11/23 15:20:00 fukachan Exp $
+# $FML: dir.pm,v 1.8 2002/12/15 14:13:16 fukachan Exp $
 #
 
 package FML::Command::Admin::dir;
@@ -67,8 +67,7 @@ sub process
 
     use FML::Restriction::Base;
     my $safe   = new FML::Restriction::Base;
-    my $regexp = $safe->basic_variable();
-    my $dirreg = $regexp->{ directory };
+    my $dirreg = $safe->regexp( 'directory' );
 
     # analyze ...
     # XXX-TODO: "admin ls -i -a tmp" ignores "tmp" but not inform the error.
@@ -113,7 +112,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002 Ken'ichi Fukamachi
+Copyright (C) 2002,2003 Ken'ichi Fukamachi
 
 All rights reserved. This program is free software; you can
 redistribute it and/or modify it under the same terms as Perl itself.
diff --git a/fml/lib/FML/Command/Admin/file.pm b/fml/lib/FML/Command/Admin/file.pm
index ba653d8b..77167fb4 100644
--- a/fml/lib/FML/Command/Admin/file.pm
+++ b/fml/lib/FML/Command/Admin/file.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2002 Ken'ichi Fukamachi
+#  Copyright (C) 2002,2003 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: file.pm,v 1.7 2002/11/23 15:20:00 fukachan Exp $
+# $FML: file.pm,v 1.8 2002/12/20 03:40:12 fukachan Exp $
 #
 
 package FML::Command::Admin::file;
@@ -74,8 +74,7 @@ sub process
 
     use FML::Restriction::Base;
     my $safe    = new FML::Restriction::Base;
-    my $regexp  = $safe->basic_variable();
-    my $filereg = $regexp->{ file };
+    my $filereg = $safe->regexp( 'file' );
 
     # argv = command subcommand args ... = command options
     my ($subcommand, @args)= @$options;
@@ -122,7 +121,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002 Ken'ichi Fukamachi
+Copyright (C) 2002,2003 Ken'ichi Fukamachi
 
 All rights reserved. This program is free software; you can
 redistribute it and/or modify it under the same terms as Perl itself.
diff --git a/fml/lib/FML/Command/DirUtils.pm b/fml/lib/FML/Command/DirUtils.pm
index cb801e00..359df002 100644
--- a/fml/lib/FML/Command/DirUtils.pm
+++ b/fml/lib/FML/Command/DirUtils.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2002 Ken'ichi Fukamachi
+#  Copyright (C) 2002,2003 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: DirUtils.pm,v 1.9 2002/09/22 14:56:43 fukachan Exp $
+# $FML: DirUtils.pm,v 1.10 2002/12/18 04:46:01 fukachan Exp $
 #
 
 package FML::Command::DirUtils;
@@ -40,8 +40,7 @@ sub new
     my $me     = {};
 
     use FML::Restriction::Base;
-    my $safe = new FML::Restriction::Base;
-    $me->{ _basic_variable } = $safe->basic_variable();
+    $me->{ _safe } = new FML::Restriction::Base;
 
     return bless $me, $type;
 }
@@ -77,8 +76,7 @@ sub dir
     }
 
     # regexp allowed to use here
-    my $basic_variable = $self->{ _basic_variable };
-    my $dir_regexp     = $basic_variable->{ directory };
+    my $dir_regexp = $self->{ _safe }->regexp( 'directory' );
 
     # chdir the ml's home dir
     my $ml_home_dir    = $config->{ ml_home_dir };
@@ -94,7 +92,7 @@ sub dir
 
     if (-x $path_ls) {
 	my $eval = "$path_ls $opt_ls $y";
-	Log($eval);
+	Log("dir: run \"$eval\"");
 
 	use FileHandle;
 	my $fh = new FileHandle "$eval|";
@@ -123,7 +121,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002 Ken'ichi Fukamachi
+Copyright (C) 2002,2003 Ken'ichi Fukamachi
 
 All rights reserved. This program is free software; you can
 redistribute it and/or modify it under the same terms as Perl itself.
diff --git a/fml/lib/FML/Command/FileUtils.pm b/fml/lib/FML/Command/FileUtils.pm
index 2f358e6f..149a1267 100644
--- a/fml/lib/FML/Command/FileUtils.pm
+++ b/fml/lib/FML/Command/FileUtils.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2002 Ken'ichi Fukamachi
+#  Copyright (C) 2002,2003 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: FileUtils.pm,v 1.7 2002/12/18 04:46:22 fukachan Exp $
+# $FML: FileUtils.pm,v 1.8 2002/12/24 10:19:43 fukachan Exp $
 #
 
 package FML::Command::FileUtils;
@@ -42,8 +42,7 @@ sub new
     my $me     = {};
 
     use FML::Restriction::Base;
-    my $safe = new FML::Restriction::Base;
-    $me->{ _basic_variable } = $safe->basic_variable();
+    $me->{ _safe } = new FML::Restriction::Base;
 
     return bless $me, $type;
 }
@@ -85,9 +84,8 @@ sub remove
     my $argv     = $du_args->{ options };
     my $is_error = 0;
 
-    # regexp
-    my $basic_variable = $self->{ _basic_variable };
-    my $file_regexp    = $basic_variable->{ file };
+    # regexp allowed here for file 
+    my $file_regexp = $self->{ _safe }->regexp( 'file' );
 
     # chdir $ml_home_dir firstly. return ASAP if failed.
     my $ml_home_dir    = $config->{ ml_home_dir };
@@ -143,7 +141,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002 Ken'ichi Fukamachi
+Copyright (C) 2002,2003 Ken'ichi Fukamachi
 
 All rights reserved. This program is free software; you can
 redistribute it and/or modify it under the same terms as Perl itself.