Index: mkimport
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/mkimport,v
retrieving revision 1.3
diff -d -u -r1.3 mkimport
--- mkimport	18 Apr 2009 17:23:45 -0000	1.3
+++ mkimport	23 Feb 2010 23:25:12 -0000
@@ -3,6 +3,9 @@
 use File::Temp qw'tempdir';
 use File::Spec;
 use Getopt::Long;
+
+$| = 1;
+
 my $dir = tempdir(CLEANUP => 1);
 
 my ($ar, $as, $nm, $objcopy, %replace);
@@ -18,7 +21,9 @@
 my $libdll = shift;
 my $inpdll = shift;
 
-open my $nm_fd, '-|', $nm, '-Apg', '--defined-only', $inpdll;
+my $cmd_nm = "$nm -Apg --defined-only \"$inpdll\"";
+print "Reading from $cmd_nm ...\n";
+open my $nm_fd, "$cmd_nm |" or die "E: $0: $cmd_nm:\n$!\n";
 my %text = ();
 my %import = ();
 my %symfile = ();
@@ -36,8 +41,8 @@
     my $fn;
     my $_sym = '_' . $sym;
     if (!defined($fn = $symfile{$_sym})) {
-	$fn = "$sym.o";
-	$text{$fn} = $_sym;
+        $fn = "$sym.o";
+        $text{$fn} = $_sym;
     }
     my $imp_sym = '__imp__' . $replace{$sym};
     $import{$fn} = $imp_sym;
@@ -47,33 +52,39 @@
     my $imp_sym = delete $import{$f};
     my $glob_sym = $text{$f};
     if (!defined $imp_sym) {
-	delete $text{$f};
+        delete $text{$f};
     } elsif ($imp_sym eq '__imp__') {
-	$text{$f} = 0;
+        $text{$f} = 0;
     } else {
-	$text{$f} = 1;
-	open my $as_fd, '|-', $as, '-o', "$dir/t-$f", "-";
-	print $as_fd <<EOF;
-	.text
-	.extern	$imp_sym
-	.global	$glob_sym
+        $text{$f} = 1;
+        my $cmd_as = "$as -o \"$dir/t-$f\" -";
+        print "Writing to $cmd_as ...\n";
+        open my $as_fd, "| $cmd_as" or die "E: $0: $cmd_as:\n$!\n";
+        print $as_fd <<EOF;
+        .text
+        .extern $imp_sym
+        .global $glob_sym
 $glob_sym:
-	jmp	*$imp_sym
+        jmp     *$imp_sym
 EOF
-	close $as_fd or exit 1;
+        close $as_fd or exit 1;
     }
 }
 
-chdir $dir or die "$0: couldn't cd to $dir - $!\n";
+print "cd $dir\n";
+chdir $dir or die "E: $0: couldn't cd to $dir - $!\n";
+print "$ar x $inpdll\n";
 system $ar, 'x', $inpdll;
 exit 1 if $?;
 
 for my $f (keys %text) {
     if (!$text{$f}) {
-	unlink $f;
+        unlink $f;
     } else {
-	system $objcopy, '-R', '.text', $f and exit 1;
-	system $objcopy, '-R', '.bss', '-R', '.data', "t-$f" and exit 1;
+        print "$objcopy -R .text t-$f\n";
+        system ( $objcopy, '-R', '.text', "t-$f" ) and die "E: $0: objcopy -R .text t-$f:\n$!\n";
+        print "$objcopy -R .bss -R .data t-$f\n";
+        system ( $objcopy, '-R', '.bss', '-R', '.data', "t-$f" ) and die "E: $0: objcopy -R .bss -R .data t-$f:\n$!\n";
     }
 }
 
@@ -81,3 +92,4 @@
 system $ar, 'crus', $libdll, glob('*.o'), @ARGV;
 unlink glob('*.o');
 exit 1 if $?;
+