[PATCH] Allow -show to be used without a config file as well.

[Richard Sharpe]

Also, only
             parse the config once if an alternate config file is specified.

Signed-off-by: Richard Sharpe <realrichardsharpe at gmail.com>

---
 scripts/tgt-admin |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/tgt-admin b/scripts/tgt-admin
index 76fab79..41c828c 100755
--- a/scripts/tgt-admin
+++ b/scripts/tgt-admin
@@ -61,16 +61,16 @@ if (($help == 1) || ($param eq undef)) {
        &usage
 }

-# Parse the config file with Config::General
-my %conf = ParseConfig(-ConfigFile => "$configfile", -UseApacheInclude => 1, -I
ncludeGlob => 1,);
-
 # Show all the targets and exit
 if ($show == 1) {
        execute("tgtadm --lld iscsi --op show --mode target");
        exit;
 }

-# Check if alternative configuration file was given
+my %conf;
+
+# Check if alternative configuration file was given and use that, else
+# use the default. ParseConfig will die if config file not found.
 if ($alternate_conf ne 0) {
        # Check if alternative configuration file exist
        if (-e $alternate_conf) {
@@ -81,6 +81,10 @@ if ($alternate_conf ne 0) {
                die("file $alternate_conf not found. Exiting...\n");
        }
 }
+else {
+       # Parse the config file with Config::General
+       my %conf = ParseConfig(-ConfigFile => "$configfile", -UseApacheInclude =
> 1, -IncludeGlob => 1,);
+}

 # Some variables/arrays/hashes we will use globally
 my %tgtadm_output;
--
1.5.5.1

------=_Part_21314_20473588.1217006538442
Content-Type: application/octet-stream;
 name=0002-Allow-show-to-be-used-without-a-config-file-as-well.patch
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fj328v0h0
Content-Disposition: attachment;
 filename=0002-Allow-show-to-be-used-without-a-config-file-as-well.patch

RnJvbSBhMTZhNjhjZGUyMTVlZWNkZjc5NGQ3ZjEwMDc3OGFlNmZhZjNmYjdkIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBSaWNoYXJkIFNoYXJwZSA8cmVhbHJpY2hhcmRzaGFycGVAZ21h
aWwuY29tPgpEYXRlOiBGcmksIDI1IEp1bCAyMDA4IDE4OjA2OjEwIC0wNzAwClN1YmplY3Q6IFtQ
QVRDSF0gQWxsb3cgLXNob3cgdG8gYmUgdXNlZCB3aXRob3V0IGEgY29uZmlnIGZpbGUgYXMgd2Vs
bC4gQWxzbywgb25seSBwYXJzZSB0aGUKIGNvbmZpZyBvbmNlIGlmIGFuIGFsdGVybmF0ZSBjb25m
aWcgZmlsZSBpcyBzcGVjaWZpZWQuCgotLS0KIHNjcmlwdHMvdGd0LWFkbWluIHwgICAxMiArKysr
KysrKy0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygt
KQoKZGlmZiAtLWdpdCBhL3NjcmlwdHMvdGd0LWFkbWluIGIvc2NyaXB0cy90Z3QtYWRtaW4KaW5k
ZXggNzZmYWI3OS4uNDFjODI4YyAxMDA3NTUKLS0tIGEvc2NyaXB0cy90Z3QtYWRtaW4KKysrIGIv
c2NyaXB0cy90Z3QtYWRtaW4KQEAgLTYxLDE2ICs2MSwxNiBAQCBpZiAoKCRoZWxwID09IDEpIHx8
ICgkcGFyYW0gZXEgdW5kZWYpKSB7CiAJJnVzYWdlCiB9CiAKLSMgUGFyc2UgdGhlIGNvbmZpZyBm
aWxlIHdpdGggQ29uZmlnOjpHZW5lcmFsCi1teSAlY29uZiA9IFBhcnNlQ29uZmlnKC1Db25maWdG
aWxlID0+ICIkY29uZmlnZmlsZSIsIC1Vc2VBcGFjaGVJbmNsdWRlID0+IDEsIC1JbmNsdWRlR2xv
YiA9PiAxLCk7Ci0KICMgU2hvdyBhbGwgdGhlIHRhcmdldHMgYW5kIGV4aXQKIGlmICgkc2hvdyA9
PSAxKSB7CiAJZXhlY3V0ZSgidGd0YWRtIC0tbGxkIGlzY3NpIC0tb3Agc2hvdyAtLW1vZGUgdGFy
Z2V0Iik7CiAJZXhpdDsKIH0KIAotIyBDaGVjayBpZiBhbHRlcm5hdGl2ZSBjb25maWd1cmF0aW9u
IGZpbGUgd2FzIGdpdmVuCitteSAlY29uZjsgCisKKyMgQ2hlY2sgaWYgYWx0ZXJuYXRpdmUgY29u
ZmlndXJhdGlvbiBmaWxlIHdhcyBnaXZlbiBhbmQgdXNlIHRoYXQsIGVsc2UgCisjIHVzZSB0aGUg
ZGVmYXVsdC4gUGFyc2VDb25maWcgd2lsbCBkaWUgaWYgY29uZmlnIGZpbGUgbm90IGZvdW5kLgog
aWYgKCRhbHRlcm5hdGVfY29uZiBuZSAwKSB7CiAJIyBDaGVjayBpZiBhbHRlcm5hdGl2ZSBjb25m
aWd1cmF0aW9uIGZpbGUgZXhpc3QKIAlpZiAoLWUgJGFsdGVybmF0ZV9jb25mKSB7CkBAIC04MSw2
ICs4MSwxMCBAQCBpZiAoJGFsdGVybmF0ZV9jb25mIG5lIDApIHsKIAkJZGllKCJmaWxlICRhbHRl
cm5hdGVfY29uZiBub3QgZm91bmQuIEV4aXRpbmcuLi5cbiIpOwogCX0KIH0KK2Vsc2UgeworCSMg
UGFyc2UgdGhlIGNvbmZpZyBmaWxlIHdpdGggQ29uZmlnOjpHZW5lcmFsCisJbXkgJWNvbmYgPSBQ
YXJzZUNvbmZpZygtQ29uZmlnRmlsZSA9PiAiJGNvbmZpZ2ZpbGUiLCAtVXNlQXBhY2hlSW5jbHVk
ZSA9PiAxLCAtSW5jbHVkZUdsb2IgPT4gMSwpOworfQogCiAjIFNvbWUgdmFyaWFibGVzL2FycmF5
cy9oYXNoZXMgd2Ugd2lsbCB1c2UgZ2xvYmFsbHkKIG15ICV0Z3RhZG1fb3V0cHV0OwotLSAKMS41
LjUuMQoK
------=_Part_21314_20473588.1217006538442--