stas 02/04/03 03:47:56
Modified: lib/DocSet DocSet.pm Util.pm
lib/DocSet/Source HTML.pm
Log:
bug fixes sync
Revision Changes Path
1.7 +0 -1 modperl-docs/lib/DocSet/DocSet.pm
Index: DocSet.pm
===================================================================
RCS file: /home/cvs/modperl-docs/lib/DocSet/DocSet.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DocSet.pm 3 Apr 2002 07:26:24 -0000 1.6
+++ DocSet.pm 3 Apr 2002 11:47:56 -0000 1.7
@@ -279,7 +279,6 @@
# # some OSs's File::Find returns files with no dir prefix root
# # (that's what ()* is for
# $dst_path =~ s/(?:$src_root)*/$dst_root/;
-# $dst_path =~ s/$src_root/$dst_root/;
$dst_path =~ s/\Q$src_root/$dst_root/;
# to rebuild or not to rebuild
1.8 +6 -8 modperl-docs/lib/DocSet/Util.pm
Index: Util.pm
===================================================================
RCS file: /home/cvs/modperl-docs/lib/DocSet/Util.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Util.pm 3 Apr 2002 07:26:24 -0000 1.7
+++ Util.pm 3 Apr 2002 11:47:56 -0000 1.8
@@ -280,19 +280,17 @@
# Parts borrowed from modperl-2.0/lib/Apache/Build.pm and modified to
# take into account Win32 PATHEXT
########################
-my @path_ext = ();
+my @path_ext = ('');
if (IS_WIN32 and $ENV{PATHEXT}) {
- @path_ext = split ';', $ENV{PATHEXT};
+ push @path_ext, split ';', $ENV{PATHEXT};
}
sub which {
- foreach (map { catfile $_, $_[0] } File::Spec->path()) {
- return $_ if -x;
- if(IS_WIN32 and @path_ext) { # AFAIK, Win9x doesn't have PATHEXT
- foreach my $ext (@path_ext) {
- return $_.$ext if -x $_.$ext;
- }
+ for my $base (map { catfile $_, $_[0] } File::Spec->path()) {
+ for my $ext (@path_ext) {
+ return $base.$ext if -x $base.$ext;
}
}
+ return '';
}
sub dumper {
1.5 +2 -2 modperl-docs/lib/DocSet/Source/HTML.pm
Index: HTML.pm
===================================================================
RCS file: /home/cvs/modperl-docs/lib/DocSet/Source/HTML.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HTML.pm 28 Mar 2002 02:19:48 -0000 1.4
+++ HTML.pm 3 Apr 2002 11:47:56 -0000 1.5
@@ -87,7 +87,7 @@
return;
}
- # escape thpse that include link elements
+ # escape those that include link elements
accum_h($self, qq{<$tagname});
for (keys %$attr) {
accum_h($self, qq{ $_="});
@@ -95,7 +95,7 @@
if ($tag_attr{"$tagname $_"}) {
$val = HTML::Entities::encode($val, ENCODE_CHARS);
}
- accum_h($self, $val);
+ accum_h($self, qq{$val"});
}
accum_h($self, qq{">});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
