More code tweaks in proc_open.c

Author: alexdowad

ext/standard/proc_open.c

@@ -1065,10 +1065,13 @@ PHP_FUNCTION(proc_open)
 			if (descriptors[i].mode == DESC_PIPE) {
 				close(descriptors[i].parentend);
 			}
-			if (dup2(descriptors[i].childend, descriptors[i].index) < 0)
+			if (dup2(descriptors[i].childend, descriptors[i].index) < 0) {
+				/* better way to report any problems? */
 				perror("dup2");
-			if (descriptors[i].childend != descriptors[i].index)
+			}
+			if (descriptors[i].childend != descriptors[i].index) {
 				close(descriptors[i].childend);
+			}
 		}
 
 		if (cwd) {
@@ -1088,22 +1091,24 @@ PHP_FUNCTION(proc_open)
 				execl("/bin/sh", "sh", "-c", command, NULL);
 			}
 		}
-		_exit(127);
 
+		/* Show errors from exec!! */
+		_exit(127);
 	} else if (child < 0) {
 		/* failed to fork() */
 		close_all_descriptors(descriptors, ndesc);
 		php_error_docref(NULL, E_WARNING, "Fork failed - %s", strerror(errno));
 		goto exit_fail;
-
 	}
 #else
 # error You lose (configure should not have let you get here)
 #endif
+
 	/* we forked/spawned and this is the parent */
 
 	pipes = zend_try_array_init(pipes);
 	if (!pipes) {
+		/* Error message? */
 		goto exit_fail;
 	}
 
@@ -1128,7 +1133,7 @@ PHP_FUNCTION(proc_open)
 	/* clean up all the child ends and then open streams on the parent
 	 * ends, where appropriate */
 	for (i = 0; i < ndesc; i++) {
-		char *mode_string=NULL;
+		char *mode_string = NULL;
 		php_stream *stream = NULL;
 
 		close_descriptor(descriptors[i].childend);