From 3f4b85b4d48711c404ff4f2bb6ae7ba4bd09d296 Mon Sep 17 00:00:00 2001
From: "preed%mozilla.com"
 <preed%mozilla.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 18 Jan 2007 03:04:55 +0000
Subject: [PATCH] Bug 366607: MozBuild::Util::RunShellCommand needs some work;
 some minor cleanup from the last checkin; quell warnings about an undef value
 in an eq, and chdir() support, and remove the gymnastics we go through to
 check for and repair old calling conventions; just assert().

git-svn-id: svn://10.0.0.236/trunk@218582 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/tools/release/MozBuild/Util.pm | 46 +++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/mozilla/tools/release/MozBuild/Util.pm b/mozilla/tools/release/MozBuild/Util.pm
index 886fd8e4f16..01763c9b5a9 100644
--- a/mozilla/tools/release/MozBuild/Util.pm
+++ b/mozilla/tools/release/MozBuild/Util.pm
@@ -7,6 +7,7 @@ use IO::Handle;
 use IO::Select;
 use IPC::Open3;
 use POSIX qw(:sys_wait_h);
+use Cwd;
 
 use base qw(Exporter);
 
@@ -59,25 +60,15 @@ sub RunShellCommand {
     my $appendLogfile = exists($args{'appendLog'}) ? $args{'appendLog'} : 1;
     my $printOutputImmediately = exists($args{'output'}) ? $args{'output'} : 0;
     my $background = exists($args{'bg'}) ? $args{'bg'} : 0;
+    my $changeToDir = exists($args{'dir'}) ?  $args{'dir'} : undef;
 
-    # This is a compatibility check for the old calling convention; if we
-    # find spaces in the command, turn it into the proper command [ args]-type
-    # call. This will break callers that "escape" their args by quoting them,
-    # i.e. foo "bar baz" buh, expecting the args to foo to be "bar baz" and
-    # "buh". They will turn out to be "\"bar", "baz\" and "buh". These callers
-    # just need to be fixed.
+    # This is a compatibility check for the old calling convention;
     if ($shellCommand =~ /\s/) {
         $shellCommand =~ s/^\s+//;
         $shellCommand =~ s/\s+$//;
 
-        my @commandParts = split(/\s+/, $shellCommand);
-
-        $shellCommand = shift(@commandParts);
-        if (defined($commandArgs)) {
-            push(@{$commandArgs}, @commandParts);
-        } else {
-            $commandArgs = \@commandParts;
-        }
+        die "ASSERT: old RunShellCommand() calling convention detected\n" 
+         if ($shellCommand =~ /\s+/);
     }
 
     # Glob the command together to check for 2>&1 constructs...
@@ -100,6 +91,7 @@ sub RunShellCommand {
  
     chomp($shellCommand);
 
+    my $cwd = getcwd();
     my $exitValue = undef;
     my $signalNum = undef;
     my $sigName = undef;
@@ -110,6 +102,11 @@ sub RunShellCommand {
     my $childPid = 0;
     my $childStartedTime = 0;
 
+    if (defined($changeToDir)) {
+        chdir($changeToDir) or die "RunShellCommand(): failed to chdir() to "
+         . "$changeToDir\n";
+    }
+
     eval {
         local $SIG{'ALRM'} = sub { die "alarm\n" };
         local $SIG{'PIPE'} = sub { die "pipe\n" };
@@ -131,6 +128,7 @@ sub RunShellCommand {
         if ($args{'background'}) {
             alarm(0);
 
+            chdir($cwd) if (defined($changeToDir));
             return { startTime => $childStartedTime,
                      endTime => undef,
                      timedOut => $timedOut,
@@ -166,7 +164,7 @@ sub RunShellCommand {
 
                 # Check for read()ing nothing, and getting errors...
                 next if ($rv == 0);
-                if ($rv eq undef) {
+                if (not defined($rv)) {
                     warn "sysread() failed with: $!\n";
                     next;
                 }
@@ -215,14 +213,16 @@ sub RunShellCommand {
         }
     }
 
-     return { startTime => $childStartedTime,
-              endTime => $childEndedTime,
-              timedOut => $timedOut,
-              exitValue => $exitValue,
-              sigName => $sigName,
-              output => $output,
-              dumpedCore => $dumpedCore
-            };
+    chdir($cwd) if (defined($changeToDir));
+
+    return { startTime => $childStartedTime,
+             endTime => $childEndedTime,
+             timedOut => $timedOut,
+             exitValue => $exitValue,
+             sigName => $sigName,
+             output => $output,
+             dumpedCore => $dumpedCore
+           };
 }
 
 ## This is a wrapper function to get easy true/false return values from a