summaryrefslogtreecommitdiff
path: root/installman
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2013-07-13 18:33:53 +0200
committerNicholas Clark <nick@ccl4.org>2013-07-23 13:39:51 +0200
commit4c4326140484b090df4dd2ed7165e669991744cc (patch)
tree0ccede8f1b692adedb20fe6377858534debd7669 /installman
parent1f55bb435760d6f0cd87d3d9fd23b3c51253b43e (diff)
downloadperl-4c4326140484b090df4dd2ed7165e669991744cc.tar.gz
Move {safe_,}rename() from install{man,perl} into install_lib.pl
installman's rename() was identical to installperl's safe_rename() in all but name (and whitespace), so de-duplicate by moving the code to install_lib.pl
Diffstat (limited to 'installman')
-rwxr-xr-xinstallman16
1 files changed, 1 insertions, 15 deletions
diff --git a/installman b/installman
index 4f9d469f6b..adb76f86e1 100755
--- a/installman
+++ b/installman
@@ -159,7 +159,7 @@ sub pod2man {
print " $xmanpage\n" unless $opts{silent};
if (!$opts{notify} && $parser->parse_from_file($mod, $tmp)) {
if (-s $tmp) {
- if (rename($tmp, $manpage)) {
+ if (safe_rename($tmp, $manpage)) {
$packlist->{$xmanpage} = { type => 'file' };
next;
}
@@ -172,20 +172,6 @@ sub pod2man {
$packlist->write() unless $opts{notify};
print " Installation complete\n" if $opts{verbose};
-sub rename {
- my($from,$to) = @_;
- if (-f $to and not unlink($to)) {
- my($i);
- for ($i = 1; $i < 50; $i++) {
- last if CORE::rename($to, "$to.$i");
- }
- warn("Cannot rename to '$to.$i': $!"), return 0
- if $i >= 50; # Give up!
- }
- link($from,$to) || return 0;
- unlink($from);
-}
-
# Local variables:
# cperl-indent-level: 4
# indent-tabs-mode: nil