summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xINSTALL.sh2
-rw-r--r--fml/lib/FML/Process/Configure.pm21
-rwxr-xr-xfml/libexec/loader7
-rwxr-xr-xfml/libexec/process_switch2
4 files changed, 24 insertions, 8 deletions
diff --git a/INSTALL.sh b/INSTALL.sh
index bce483b4..9aaf09fb 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -81,7 +81,7 @@ if [ ! -f $libexec_dir/loader ];then
cd $libexec_dir/
echo -n " link loader to: "
- for x in fml.pl distribute command fmlserv mead fmlconf fmlticket
+ for x in fml.pl distribute command fmlserv mead fmlconf fmlticket fmldoc
do
rm -f $x
ln -s loader $x && echo -n "$x "
diff --git a/fml/lib/FML/Process/Configure.pm b/fml/lib/FML/Process/Configure.pm
index 60a6486b..0101cd8d 100644
--- a/fml/lib/FML/Process/Configure.pm
+++ b/fml/lib/FML/Process/Configure.pm
@@ -40,14 +40,27 @@ sub prepare
sub run
{
my ($curproc, $args) = @_;
+ my $config = $curproc->{ config };
+ my $myname = $args->{ myname };
+ my $argv = $args->{ ARGV };
+ my $command = $argv->[ 0 ] || croak("command not specified\n");
- # use Data::Dumper; print Dumper( $args ); sleep 30;
+ # XXX debug
+ # use Data::Dumper; print Dumper( $args ); sleep 3;
- $curproc->lock();
- {
+ if ($myname eq 'fmlconf') {
$curproc->_show_conf($args);
}
- $curproc->unlock();
+ elsif ($myname eq 'fmldoc') {
+ exec 'perldoc', @$argv;
+ }
+ else {
+ $curproc->lock();
+ {
+ ;
+ }
+ $curproc->unlock();
+ }
}
diff --git a/fml/libexec/loader b/fml/libexec/loader
index 54ef7da4..8b970c05 100755
--- a/fml/libexec/loader
+++ b/fml/libexec/loader
@@ -4,7 +4,7 @@
# Copyright (C) 2000-2001 Ken'ichi Fukamachi
# All rights reserved.
#
-# $Id: loader,v 1.8 2001/02/06 11:26:32 fukachan Exp $
+# $Id: loader,v 1.9 2001/02/06 12:07:37 fukachan Exp $
# $FML$
#
@@ -70,7 +70,7 @@ sub Bootstrap
use File::Basename;
my $myname = basename($0);
- # parse command line options
+ # parse command line options (preliminary)
GetOptions(\%options, FML::prepare_myname_options($myname));
# 2.1 o.k. try to load main.cf
@@ -170,6 +170,9 @@ sub prepare_myname_options
elsif ($myname eq 'fmlconf') {
return qw(ctladdr! debug! params=s -c=s n!);
}
+ elsif ($myname eq 'fmldoc') {
+ return qw(ctladdr! debug! params=s -c=s n!);
+ }
else {
croak "$myname is unknown yet\n";
}
diff --git a/fml/libexec/process_switch b/fml/libexec/process_switch
index e07fb4c7..bd6a11ad 100755
--- a/fml/libexec/process_switch
+++ b/fml/libexec/process_switch
@@ -60,7 +60,7 @@ sub _module_we_use
elsif ($name eq 'fmlserv') {
$pkg = 'FML::Process::ListServer';
}
- elsif ($name eq 'fmlconf' || $name eq 'makefml') {
+ elsif ($name eq 'fmlconf' || $name eq 'fmldoc' || $name eq 'makefml') {
$pkg = 'FML::Process::Configure';
}
elsif ($name eq 'fmlticket') {