import OpenSSL-1.0.1c

1 files changed, 11 insertions, 0 deletions

diff --git a/src/lib/libssl/src/util/copy.pl b/src/lib/libssl/src/util/copy.pl
index e20b45530a..eba6d5815e 100644
--- a/src/lib/libssl/src/util/copy.pl
+++ b/src/lib/libssl/src/util/copy.pl
@@ -8,9 +8,16 @@ use Fcntl;
 # Perl script 'copy' comment. On Windows the built in "copy" command also
 # copies timestamps: this messes up Makefile dependencies.
 
+my $stripcr = 0;
+
 my $arg;
 
 foreach $arg (@ARGV) {
+        if ($arg eq "-stripcr")
+                {
+                $stripcr = 1;
+                next;
+                }
         $arg =~ s|\\|/|g;       # compensate for bug/feature in cygwin glob...
         foreach (glob $arg)
                 {
@@ -49,6 +56,10 @@ foreach (@filelist)
                                         || die "Can't Open $dfile";
         while (sysread IN, $buf, 10240)
                 {
+                if ($stripcr)
+                        {
+                        $buf =~ tr/\015//d;
+                        }
                 syswrite(OUT, $buf, length($buf));
                 }
         close(IN);