From 863cd653c5090952f92eb300beecbf8e667fcfe6 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Sat, 8 Mar 2025 14:45:58 +0100 Subject: Replace (file)node by file/node URLs --- info2html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/info2html b/info2html index 1015868..51d4841 100755 --- a/info2html +++ b/info2html @@ -209,7 +209,7 @@ sub MenuItem2HTML{ # Yes, we routinely double-escape. Does anyone remember why? #-- produce a HTML line - return "$MENU_DOT$MenuLinkRef$MenuLinkText"; + return "$MENU_DOT$MenuLinkRef$MenuLinkText"; } #------------------------------------------------------------- @@ -343,7 +343,7 @@ sub ParsCrossRefs{ $CrossRefRef =~ s/-NEWLINE-/\n/g; $CrossRefTag = &Escape($CrossRefTag); # -- escape specials $BaseInfoFile = &Escape($BaseInfoFile); - $NewLine .= "$CR_URL$CrossRefRef$CrossRefText"; + $NewLine .= "$CR_URL$CrossRefRef$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 .= "$CR_URL$CrossRefRef$CrossRefText"; + $NewLine .= "$CR_URL$CrossRefRef$CrossRefText"; } if ($NewLine =~ /\*Note([^\t\,\.]*)$/i) { return "DONTPRINTYET $NewLine"; @@ -425,7 +425,7 @@ sub PrintLinkInfo{ $LinkFileEsc = &Escape($LinkFile); #-- print the HTML Text print <<"EOF"; -$LinkTypeText $LinkFilePre$LinkRef 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#([^/]+)/(.+)#) { # / + $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; -- cgit v1.2.3