From 2da0ddd47d3552fab5c94162bf924a2183c10374 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 17 Feb 2019 22:07:35 +0000
Subject: [PATCH] scstadmin: Avoid passing 'undef' to chomp()

This patch does not change any functionality.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7946 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 .../scst-1.0.0/lib/SCST/SCST.pm               | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
index 6ed59b059..fca271819 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
@@ -458,7 +458,8 @@ sub scstAttributes {
 				}
 
 				my $value = <$io>;
-				chomp $value if (defined($value));
+				$value = "" if (!defined($value));
+				chomp $value;
 
 				my $is_key = <$io>;
 				$is_key = new_sysfs_interface() && !$is_static ||
@@ -772,10 +773,7 @@ sub aluaAttributes {
 			}
 
 			my $value = <$io>;
-			if (!defined($value)) {
-				$value = "";
-			}
-
+			$value = "" if (!defined($value));
 			chomp $value;
 
 			my $second_line = <$io>;
@@ -2768,6 +2766,7 @@ sub driverAttributes {
 				}
 
 				my $value = <$io>;
+				$value = "" if (!defined($value));
 				chomp $value;
 
 				my $is_key = <$io>;
@@ -2924,7 +2923,8 @@ sub targetAttributes {
 				}
 
 				my $value = <$io>;
-				chomp $value if (defined($value));
+				$value = "" if (!defined($value));
+				chomp $value;
 
 				my $is_key = <$io>;
 				close $io;
@@ -3058,6 +3058,7 @@ sub groupAttributes {
 				}
 
 				my $value = <$io>;
+				$value = "" if (!defined($value));
 				chomp $value;
 
 				my $is_key = <$io>;
@@ -3213,6 +3214,7 @@ sub lunAttributes {
 				}
 
 				my $value = <$io>;
+				$value = "" if (!defined($value));
 				chomp $value;
 
 				my $is_key = <$io>;
@@ -3367,6 +3369,7 @@ sub initiatorAttributes {
 				}
 
 				my $value = <$io>;
+				$value = "" if (!defined($value));
 				chomp $value;
 
 				my $is_key = <$io>;
@@ -3489,6 +3492,7 @@ sub deviceGroupAttributes {
 				}
 
 				my $value = <$io>;
+				$value = "" if (!defined($value));
 				chomp $value;
 
 				my $is_key = <$io>;
@@ -3569,6 +3573,7 @@ sub targetGroupAttributes {
 				}
 
 				my $value = <$io>;
+				$value = "" if (!defined($value));
 				chomp $value;
 
 				my $is_key = <$io>;
@@ -3658,6 +3663,7 @@ sub targetGroupTargetAttributes {
 				}
 
 				my $value = <$io>;
+				$value = "" if (!defined($value));
 				chomp $value;
 
 				my $is_key = <$io>;
@@ -3940,7 +3946,8 @@ sub handlerAttributes {
 		}
 
 		my $value = <$io>;
-		chomp $value if (defined($value));
+		$value = "" if (!defined($value));
+		chomp $value;
 
 		my $is_key = <$io>;
 		$is_key = new_sysfs_interface() && !$is_static ||
@@ -4757,8 +4764,9 @@ sub sessions {
 						}
 
 						my $value = <$io>;
-						close $io;
+						$value = "" if (!defined($value));
 						chomp $value;
+						close $io;
 
 						$_sessions{$session}->{$attribute}->{'value'} = $value;
 						$_sessions{$session}->{$attribute}->{'static'} = $is_static;