Imported Upstream version 3.3.3

[debian/amanda] / server-src / amoverview.pl

diff --git a/server-src/amoverview.pl b/server-src/amoverview.pl
index 9990635a68b0bca0bb8470d771521544a9d20f32..eb53a3f1475f5676a075bb65f491c01a5d18e90c 100644 (file)
--- a/server-src/amoverview.pl
+++ b/server-src/amoverview.pl
@@ -1,9 +1,10 @@
 #!@PERL@
-# Copyright (c) 2010 Zmanda Inc.  All Rights Reserved.
+# Copyright (c) 2010-2012 Zmanda Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -31,22 +32,21 @@ use POSIX;
 
 sub Usage {
     print STDERR <<END;
-Usage: $0 [[--config] CONFIG] [--hostwidth width] [--diskwidth width]
-         [-skipmissed] [--last] [--num0] [--togo0] [--verbose]
+Usage: $0 [--hostwidth width] [--diskwidth width] [--skipmissed]
+         [--last] [--num0] [--togo0] [--verbose] [--config] <config>
 
 This script generates to standard output an overview of the filesystems
 dumped over time and the type of dump done on a particular day, such as
 a full dump, or an incremental, or if the dump failed.
 
-You may override the default configuration `@DEFAULT_CONFIG@' by using
-the --config command line option.  On larger installations, this script
-will take a while to run.  In this case, run it with --verbose to see
-how far along it is.
+On larger installations, this script will take a while to run.  In this case,
+run it with --verbose to see how far along it is.
 END
     exit 1;
 }
 
 # overrideable defaults
+my $opt_version;
 my $opt_config         = undef;
 my $opt_hostwidth      = 8;
 my $opt_diskwidth      = 20;
@@ -56,7 +56,8 @@ my $opt_num0          = 0;
 my $opt_togo0          = 0;
 my $opt_verbose                = 0;
 
-GetOptions('config=s'          => \$opt_config,
+GetOptions('version'            => \$opt_version,
+          'config=s'           => \$opt_config,
           'hostwidth=i'        => \$opt_hostwidth,
           'diskwidth=i'        => \$opt_diskwidth,
           'skipmissed'         => \$opt_skipmissed,
@@ -66,10 +67,17 @@ GetOptions('config=s'               => \$opt_config,
           'verbose'            => \$opt_verbose)
 or Usage();
 
-if(@ARGV == 1) {
-  $opt_config = $ARGV[0];
-} else {
-  Usage();
+if (defined $opt_version) {
+    print "amoverview-" . $Amanda::Constants::VERSION , "\n";
+    exit 0;
+}
+
+unless(defined($opt_config)) {
+    if (@ARGV == 1) {
+       $opt_config = $ARGV[0];
+    } else {
+       Usage();
+    }
 }
 
 #Initialize configuration