cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid recursing ad nauseam on symlinks.

Browse Source
This commit is contained in:
espie 2007-04-08 15:22:49 +00:00
parent 614acb6b61
commit e9ebd9d4e4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
infrastructure/install/make-plist
View File

@ -1,5 +1,5 @@
#! /usr/bin/perl
# $OpenBSD: make-plist,v 1.92 2007/02/07 11:24:23 bernd Exp $
# $OpenBSD: make-plist,v 1.93 2007/04/08 15:22:49 espie Exp $
# Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -527,12 +527,17 @@ sub get_type
sub resolve_link
{
my $filename = shift;
my $level = shift || 0;
if (-l $filename) {
my $l = readlink($filename);
if ($level++ > 14) {
print STDERR "Symlink too deep: $filename\n";
return $filename;
}
if ($l =~ m|^/|) {
return $destdir.resolve_link($l);
return $destdir.resolve_link($l, $level);
} else {
return resolve_link(File::Spec->catfile(dirname($filename),$l));
return resolve_link(File::Spec->catfile(dirname($filename),$l), $level);
}
} else {
return $filename;