aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/ebuild
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/e/ebuild')
-rwxr-xr-xpaludis/repositories/e/ebuild/pipe_functions.bash6
-rw-r--r--paludis/repositories/e/ebuild/utils/locked_pipe_command.cc4
2 files changed, 5 insertions, 5 deletions
diff --git a/paludis/repositories/e/ebuild/pipe_functions.bash b/paludis/repositories/e/ebuild/pipe_functions.bash
index 22ead7f35..a8a158506 100755
--- a/paludis/repositories/e/ebuild/pipe_functions.bash
+++ b/paludis/repositories/e/ebuild/pipe_functions.bash
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007, 2008 Ciaran McCreesh
+# Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
@@ -43,8 +43,8 @@ paludis_pipe_command()
exit 123
fi
- local r r1 rest
- r="$(echo "$@" | {
+ local r r1 rest a
+ r="$(for a in "$@" ; do echo -n "$a"$'\2' ; done | {
if ! locked_pipe_command "${PALUDIS_PIPE_COMMAND_WRITE_FD}" "${PALUDIS_PIPE_COMMAND_READ_FD}" ; then
type die &>/dev/null && eval die "\"locked_pipe_command failed\""
echo "locked_pipe_command failed" 1>&2
diff --git a/paludis/repositories/e/ebuild/utils/locked_pipe_command.cc b/paludis/repositories/e/ebuild/utils/locked_pipe_command.cc
index eca37809d..ad71045ab 100644
--- a/paludis/repositories/e/ebuild/utils/locked_pipe_command.cc
+++ b/paludis/repositories/e/ebuild/utils/locked_pipe_command.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2009 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -65,7 +65,7 @@ main(int argc, char *argv[])
return EXIT_FAILURE;
}
- /* append null to the pipe read buffer */
+ /* append an 'end' marker to the pipe read buffer */
buf[0] = '\0';
while (((w = write(write_fd, buf, 1))) == 0)
sleep(0);