change getopt() definition following $0

1 files changed, 29 insertions, 10 deletions

diff --git a/fml/libexec/loader b/fml/libexec/loader
index d22a43fa..2c4bf267 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.4 2001/02/01 08:43:16 fukachan Exp $ 
+# $Id: loader,v 1.5 2001/02/05 04:44:49 fukachan Exp $ 
 # $FML$
 #
 
@@ -65,10 +65,13 @@ sub Bootstrap
     my %options = ();
     my $my_default_config = '';
     my $ml_home_dir       = ''; # e.g. /var/spool/ml/elena
-    GetOptions(\%options, 
-	       qw(ctladdr! debug! params=s -c=s)
-	       );
 
+    # inspect my name from $0
+    use File::Basename;
+    my $myname = basename($0);
+
+    # parse command line options
+    GetOptions(\%options, FML::prepare_myname_options($myname));
     for (@ARGV) {
 	if (-d $_) {
 	    $ml_home_dir = $_;
@@ -94,13 +97,9 @@ sub Bootstrap
     unshift(@INC, split(/\s+/, $main_cf->{ lib_dir }));	    
     unshift(@INC, split(/\s+/, $main_cf->{ local_lib_dir }));
 
-    # 4. inspect my mode from $0
-    use File::Basename;
-    my $myname = basename($0);
-
-    # debug;
+    # 4. debug
     if ($0 =~ /loader/) {
-	use Data::Dumper; print Dumper( $main_cf ); sleep 3;
+	eval q#use Data::Dumper; print Dumper( $main_cf ); sleep 3;#;
     }
 
     # 5. o.k. here we go!
@@ -135,6 +134,26 @@ sub Bootstrap
 }
 
 
+package FML;
+use Carp;
+use strict;
+
+sub prepare_myname_options
+{
+    my ($myname) = @_;
+
+    if ($myname eq 'fml.pl' || $myname eq 'loader') { 
+	return qw(ctladdr! debug! params=s -c=s);
+    }
+    elsif ($myname eq 'fmlticket') {
+	return qw(debug! params=s -c=s -A=s -R=s);
+    } 
+    else {
+	croak "$myname is unknown yet\n";
+    }
+}
+
+
 =head1 NAME
 
 loader -- the wrapper which executes a real fml5 program.