From cac3fadd5244efab88a7d39b605730c92b4ac22c Mon Sep 17 00:00:00 2001 From: Steve Hay Date: Fri, 6 Feb 2004 16:14:14 +0000 Subject: [PATCH] Fix absolute path handling in installhtml Message-ID: <4023BD56.6090903@uk.radan.com> p4raw-id: //depot/perl@22285 --- installhtml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/installhtml b/installhtml index 967f0c6..5a76ba0 100755 --- a/installhtml +++ b/installhtml @@ -4,6 +4,7 @@ use strict; use Config; # for config options in the makefile +use File::Spec; use Getopt::Long; # for command-line parsing use Cwd; use Pod::Html 'anchorify'; @@ -293,15 +294,6 @@ sub parse_command_line { } -sub absolute_path { - my($cwd, $path) = @_; - return "$cwd/$path" unless $path =~ m:/:; - # add cwd if path is not already an absolute path - $path = "$cwd/$path" if (substr($path,0,1) ne '/'); - return $path; -} - - sub create_index { my($html, $dir) = @_; (my $pod = $dir) =~ s,^.*/,,; @@ -391,8 +383,8 @@ sub split_on_item { print "splitting files by item.\n" if $verbose && $#splititem >= 0; $pwd = getcwd(); - my $splitter = absolute_path($pwd, "$splitpod/splitpod"); - my $perl = absolute_path($pwd, $^X); + my $splitter = File::Spec->rel2abs("$splitpod/splitpod", $pwd); + my $perl = File::Spec->rel2abs($^X, $pwd); foreach my $pod (@splititem) { # figure out the directory to split into $pod =~ s,^([^/]*)$,/$1,; -- 2.7.4