[patch] helper-functions.sh patch

helper-functions.sh.patch (text/plain), 962 bytes, created by Alan Hourihane on 2013-10-06 13:54:18 UTC

--- helper-functions.sh.old	2013-10-06 10:30:27.790015093 +0100
+++ helper-functions.sh	2013-10-06 11:26:35.213617423 +0100
@@ -21,8 +21,9 @@
 	# Setup a pipe for children to write their pids to when they finish.
 	mj_control_pipe=$(mktemp -t multijob.XXXXXX)
 	rm "${mj_control_pipe}"
-	mkfifo "${mj_control_pipe}"
-	__redirect_alloc_fd mj_control_fd "${mj_control_pipe}"
+	mkfifo -m 600 "${mj_control_pipe}"
+	__redirect_alloc_fd mj_read_fd "${mj_control_pipe}"
+	__redirect_alloc_fd mj_write_fd "${mj_control_pipe}"
 	rm -f "${mj_control_pipe}"
 
 	# See how many children we can fork based on the user's settings.
@@ -31,13 +32,13 @@
 }
 
 __multijob_child_init() {
-	trap 'echo ${BASHPID} $? >&'${mj_control_fd} EXIT
+	trap 'echo ${BASHPID} $? >&'${mj_write_fd} EXIT
 	trap 'exit 1' INT TERM
 }
 
 __multijob_finish_one() {
 	local pid ret
-	read -r -u ${mj_control_fd} pid ret
+	read -r -u ${mj_read_fd} pid ret
 	: $(( --mj_num_jobs ))
 	return ${ret}
 }