BUG: refs #68. exec function was changing cwd, but not channging back.

Michael Grauer · Michael Grauer · commit b8d9ad4484ae · 2011-12-02T17:21:09.000-05:00
diff --git a/library/KWUtils.php b/library/KWUtils.php
@@ -141,6 +141,7 @@ public static function appendStringIfNot($subject, $ext)
    */
   public static function exec($command, &$output = null, $chdir = "", &$return_val = null)
     {
+    $currCwd = getcwd();  
     if(!empty($chdir) && is_dir($chdir))
       {
       if(!chdir($chdir))
@@ -151,6 +152,11 @@ public static function exec($command, &$output = null, $chdir = "", &$return_val
     // on Linux need to add redirection to handle stderr
     $redirect_error = KWUtils::isLinux() ? " 2>&1" : "";
     exec(KWUtils::escapeCommand($command) . $redirect_error, $output, $return_val);
+    // change back to original directory
+    if(!chdir($currCwd))
+      {
+      throw new Zend_Exception("Failed to change back to original directory: [".$currCwd."]");
+      }
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ public static function appendStringIfNot($subject, $ext)`
`141`	`141`	`*/`
`142`	`142`	`public static function exec($command, &$output = null, $chdir = "", &$return_val = null)`
`143`	`143`	`{`
	`144`	`+ $currCwd = getcwd();`
`144`	`145`	`if(!empty($chdir) && is_dir($chdir))`
`145`	`146`	`{`
`146`	`147`	`if(!chdir($chdir))`
`@@ -151,6 +152,11 @@ public static function exec($command, &$output = null, $chdir = "", &$return_val`
`151`	`152`	`// on Linux need to add redirection to handle stderr`
`152`	`153`	`$redirect_error = KWUtils::isLinux() ? " 2>&1" : "";`
`153`	`154`	`exec(KWUtils::escapeCommand($command) . $redirect_error, $output, $return_val);`
	`155`	`+ // change back to original directory`
	`156`	`+ if(!chdir($currCwd))`
	`157`	`+ {`
	`158`	`+ throw new Zend_Exception("Failed to change back to original directory: [".$currCwd."]");`
	`159`	`+ }`
`154`	`160`	`}`
`155`	`161`
`156`	`162`