Merge branch 'master' into lukeshu/xbs

1 files changed, 20 insertions, 3 deletions

diff --git a/src/chroot-tools/indent b/src/chroot-tools/indent
index 0e2d0e0..ffec4d5 100755
--- a/src/chroot-tools/indent
+++ b/src/chroot-tools/indent
@@ -1,4 +1,23 @@
 #!/usr/bin/env perl
+# Copyright (C) 2013 Luke Shumaker <lukeshu@sbcglobal.net>
+#
+# License: GNU GPLv3+
+#
+# This file is part of Parabola.
+#
+# Parabola is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Parabola is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Parabola. If not, see <http://www.gnu.org/licenses/>.
+
 use warnings;
 use strict;
 use constant BUFFER_SIZE => 40;
@@ -19,9 +38,7 @@ while (1) {
 		$c = substr($buffer, $_, 1);
 		if ($c eq "\n") {
 			syswrite(STDOUT, $indent) if ($print_indent);
-			# XXX: SYSTEMD-STDOUT HACK
-			#syswrite(STDOUT, $c, 1);
-			syswrite(STDOUT, "\r\n", 2);
+			syswrite(STDOUT, $c, 1);
 			$print_indent = 1;
 		} elsif ($c eq "\r") {
 			syswrite(STDOUT, $c, 1);