OSSP CVS Repository

Check-in Number:	4918
Date:	2004-Dec-26 18:09:13 (local) 2004-Dec-26 17:09:13 (UTC)
User:	rse
Branch:
Comment:	fix --config processing
Tickets:
Inspections:
Files:	ossp-pkg/flow2rrd/flow2rrd.pl      1.7 -> 1.8     3 inserted, 3 deleted ossp-pkg/flow2rrd/flow2rrd.pod      1.4 -> 1.5     1 inserted, 1 deleted

---

ossp-pkg/flow2rrd/flow2rrd.pl 1.7 -> 1.8

--- flow2rrd.pl 2004/12/26 15:20:00 1.7 +++ flow2rrd.pl 2004/12/26 17:09:13 1.8 @@ -70,7 +70,7 @@ my %getopt_spec = ( 'h|help' => \$opt->{-help}, 'v|version' => \$opt->{-version}, - 'c|config=s' => \$opt->{-config}, + 'f|config=s' => \$opt->{-config}, 's|store' => \$opt->{-store}, 'g|graph' => \$opt->{-graph}, 'c|cgi' => \$opt->{-cgi}, @@ -82,7 +82,7 @@ "available options are:\n" . " -h,--help print out this usage page\n" . " -v,--version print program version\n" . - " -c,--config FILE read this configuration file only\n" . + " -f,--config FILE read this configuration file only\n" . " -s,--store store NetFlow values into RRD\n" . " -g,--graph produce RRD graphs\n" . " -c,--cgi produce Web user interface\n"; @@ -801,7 +801,7 @@ $graph =~ s|\@|\@$tmpfile:|s; # generate graph image - my $rc = system("GATEWAY_INTERFACE=none $0 --graph $graph"); + my $rc = system("GATEWAY_INTERFACE=none $0 --config=\"$opt->{-config}\" --graph $graph"); if ($rc != 0) { # or not -s $tmpfile) { die "failed to generate graph image: $!"; }

---

ossp-pkg/flow2rrd/flow2rrd.pod 1.4 -> 1.5

--- flow2rrd.pod 2004/12/26 15:20:00 1.4 +++ flow2rrd.pod 2004/12/26 17:09:13 1.5 @@ -78,7 +78,7 @@ =over 4 -=item B<-c>|B<--config> I<file> +=item B<-f>|B<--config> I<file> Specifies the path to the F<flow2rrd.cfg> configuration file. See B<CONFIGURATION> section below for details on the