summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-04 23:01:42 +0000
committerKarl Berry <karl@freefriends.org>2012-11-04 23:01:42 +0000
commit4b47c3f965c24019a694fd8cd38c0a97c120222d (patch)
treee4108a845b5d01fdbeb8a0c5e17950a0749977ac /Master
parent97d39c4617060d1f315ee8f66ed7af07f7ca4ac8 (diff)
pdfcrop (4nov12)
git-svn-id: svn://tug.org/texlive/trunk@28175 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/support/pdfcrop/README4
-rwxr-xr-xMaster/texmf-dist/scripts/pdfcrop/pdfcrop.pl12
2 files changed, 12 insertions, 4 deletions
diff --git a/Master/texmf-dist/doc/support/pdfcrop/README b/Master/texmf-dist/doc/support/pdfcrop/README
index 635a325d0f2..4ea8503d799 100644
--- a/Master/texmf-dist/doc/support/pdfcrop/README
+++ b/Master/texmf-dist/doc/support/pdfcrop/README
@@ -1,4 +1,4 @@
-README for pdfcrop 2012/10/16 v1.37
+README for pdfcrop 2012/11/02 v1.38
TABLE OF CONTENTS
=================
@@ -247,6 +247,8 @@ L. HISTORY
2012/10/16 v1.36: * More error codes added.
2012/10/16 v1.37: * Extended error messages if available.
* Fix for broken v1.36.
+2012/11/02 v1.38: * Fix for unsufficient cleanup, if function `cleanup' is
+ prematurely called in `eval' for `symlink' checking.
M. TODO
diff --git a/Master/texmf-dist/scripts/pdfcrop/pdfcrop.pl b/Master/texmf-dist/scripts/pdfcrop/pdfcrop.pl
index 723433c67b6..b7662c15f26 100755
--- a/Master/texmf-dist/scripts/pdfcrop/pdfcrop.pl
+++ b/Master/texmf-dist/scripts/pdfcrop/pdfcrop.pl
@@ -22,8 +22,8 @@ $^W=1; # turn warning on
my $prj = 'pdfcrop';
my $file = "$prj.pl";
my $program = uc($&) if $file =~ /^\w+/;
-my $version = "1.37";
-my $date = "2012/10/16";
+my $version = "1.38";
+my $date = "2012/11/02";
my $author = "Heiko Oberdiek";
my $copyright = "Copyright (c) 2002-2012 by $author.";
#
@@ -105,6 +105,8 @@ my $copyright = "Copyright (c) 2002-2012 by $author.";
# 2012/10/16 v1.36: * More error codes added.
# 2012/10/16 v1.37: * Extended error messages if available.
# * Fix for broken v1.36.
+# 2012/11/02 v1.38: * Fix for unsufficient cleanup, if function `cleanup' is
+# prematurely called in `eval' for `symlink' checking.
### program identification
my $title = "$program $version, $date - $copyright\n";
@@ -688,7 +690,11 @@ if ($inputfile eq '-') {
elsif (not $inputfile =~ /^[\w\d\.\-\:\/@]+$/) { # /[\s\$~'"#{}%]/
$inputfilesafe = "$tmp-img.pdf";
push @unlink_files, $inputfilesafe;
- my $symlink_exists = eval { symlink("", ""); 1 };
+ my $symlink_exists = eval {
+ local $SIG{'__DIE__'};
+ symlink("", "");
+ 1;
+ };
print "* Input file name `$inputfile' contains special characters.\n"
. "* " . ($symlink_exists ? "Link" : "Copy")
. " input file to temporary file `$inputfilesafe'.\n"