Branch: master

cb350ca2 2018-07-25 05:52:48 Michele Calgaro
tdeioslave: fixed info protocol, which was no longer working with recent
perl version.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M tdeioslave/info/kde-info2html

tdeioslave/info/kde-info2html

diff --git a/tdeioslave/info/kde-info2html b/tdeioslave/info/kde-info2html
index 9ecebfb..fb7f9f2 100755
--- a/tdeioslave/info/kde-info2html
+++ b/tdeioslave/info/kde-info2html
@@ -151,7 +151,7 @@
 		next if $looking && !/\* Menu/;
 		$looking = 0;
 		my @item = &ParseMenuItem($_,'dir');
-		if (!defined(@item)) { next }
+		if (!@item) { next }
     		my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @item;
 		if ($MenuLinkRef eq $FileName) {
 			&Redirect($MenuLinkFile, $MenuLinkTag);
@@ -406,7 +406,7 @@
 sub MenuItem2HTML {
     my ($Line, $BaseInfoFile) = @_;
     my @parse_results = &ParseMenuItem($Line, $BaseInfoFile);
-    if (!defined (@parse_results)) { return $Line; }
+    if (!@parse_results) { return $Line; }
     my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @parse_results;
     #-- produce a HTML line
     return "<tr class=\"infomenutr\"><td class=\"infomenutd\" width=\"30%\"><ul><li><a href=\"info:/$MenuLinkFile/$MenuLinkTag\">$MenuLinkRef</a></ul></td><td class=\"infomenutd\">$MenuLinkText";
@@ -959,7 +959,7 @@
 # lpc (16 March 2003)
   &ReadTagTable($BaseInfoFile, \%TagList, \$Exists, \$IsIndirect);
   return "", 0 unless $Exists;                      #-- no tag table available
-  return "", 0 unless defined $TagList{$NodeName};  #-- tag is not in the tag table
+  return "", 0 unless $TagList{$NodeName};  #-- tag is not in the tag table
   ($File, $Offset) = split(/#/, $TagList{$NodeName});
   return $File, &max($Offset - 100, 0) if $File; #-- there is an explicite
                                                #-- not in the tag table