diff options
Diffstat (limited to 'info2html')
| -rwxr-xr-x | info2html | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -209,7 +209,7 @@ sub MenuItem2HTML{ # Yes, we routinely double-escape. Does anyone remember why? #-- produce a HTML line - return "$MENU_DOT<a class='menux' href=\"info:($MenuLinkFile)$MenuLinkTag\">$MenuLinkRef</a>$MenuLinkText"; + return "$MENU_DOT<a class='menux' href=\"info:$MenuLinkFile/$MenuLinkTag\">$MenuLinkRef</a>$MenuLinkText"; } #------------------------------------------------------------- @@ -343,7 +343,7 @@ sub ParsCrossRefs{ $CrossRefRef =~ s/-NEWLINE-/\n/g; $CrossRefTag = &Escape($CrossRefTag); # -- escape specials $BaseInfoFile = &Escape($BaseInfoFile); - $NewLine .= "<a class='xref' title='a cross reference' href=\"info:($BaseInfoFile)$CrossRefTag\"\n>$CR_URL$CrossRefRef</a>$CrossRefText"; + $NewLine .= "<a class='xref' title='a cross reference' href=\"info:$BaseInfoFile/$CrossRefTag\"\n>$CR_URL$CrossRefRef</a>$CrossRefText"; next; # -- .. take the next one } if ($CrossRef !~ /$TE/) { # never mind if tag doesn't end on this line @@ -377,7 +377,7 @@ sub ParsCrossRefs{ $CrossRefTag = &Escape($CrossRefTag); #-- escape specials $CrossRefFile = &Escape($CrossRefFile); #-- append the HTML text - $NewLine .= "<a class='xref' title='a cross reference' href=\"info:($CrossRefFile)$CrossRefTag\"\n>$CR_URL$CrossRefRef</a>$CrossRefText"; + $NewLine .= "<a class='xref' title='a cross reference' href=\"info:$CrossRefFile/$CrossRefTag\"\n>$CR_URL$CrossRefRef</a>$CrossRefText"; } if ($NewLine =~ /\*Note([^\t\,\.]*)$/i) { return "DONTPRINTYET $NewLine"; @@ -425,7 +425,7 @@ sub PrintLinkInfo{ $LinkFileEsc = &Escape($LinkFile); #-- print the HTML Text print <<"EOF"; -<a href="info:($LinkFileEsc)$LinkTag" $LinkAtts +<a href="info:$LinkFileEsc/$LinkTag" $LinkAtts >$LinkTypeText $LinkFilePre$LinkRef</a> EOF @@ -647,16 +647,16 @@ sub FindFile { #------------------- MAIN ----------------------------- $PROGRAM = "info2html"; ## +A.M.Danischewski 20151225 $CommandLine = DeEscape($ARGV[0]); ## +A.M.Danischewski 20151225 -if ($CommandLine =~ /\(([^\)]+)\)(.+)/) { - $BaseInfoFile = &DeEscape($1); - $BaseInfoFile =~ s#\.\./##g; # jonh 5/20/97 -- sanitize up-references - $NodeName = &DeEscape($2); +if ($CommandLine =~ m#([^/]+)/(.+)#) { # <file>/<node> + $BaseInfoFile = &DeEscape($1); + $BaseInfoFile =~ s#\.\./##g; # jonh 5/20/97 -- sanitize up-references + $NodeName = &DeEscape($2); } elsif( $CommandLine =~ /^([-_0-9a-zA-Z]+)$/) { # tolerate bare queries - $BaseInfoFile = &DeEscape($1); - $NodeName = 'Top'; + $BaseInfoFile = &DeEscape($1); + $NodeName = 'Top'; } else { - $BaseInfoFile = 'dir'; - $NodeName = 'Top'; + $BaseInfoFile = 'dir'; + $NodeName = 'Top'; } $BaseInfoFile = "dir" if $BaseInfoFile =~ /^dir$/i; |