From ff48c0d9098080b51ea12710029135916d117806 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 30 Mar 2010 12:36:28 +0000
Subject: svn merge -r514:HEAD ^/branches/released .

---
 openssl/util/copy.pl | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'openssl/util/copy.pl')

diff --git a/openssl/util/copy.pl b/openssl/util/copy.pl
index eba6d5815..e20b45530 100644
--- a/openssl/util/copy.pl
+++ b/openssl/util/copy.pl
@@ -8,16 +8,9 @@ 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)
 		{
@@ -56,10 +49,6 @@ 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);
-- 
cgit v1.2.3