Merge branch 'master' of git.distorted.org.uk:public-git/misc

* 'master' of git.distorted.org.uk:public-git/misc:
  xtitle.c: Ignore boring return codes better.
  hush.1.in: Fix some stupid (but relatively minor) formatting foulups.

diff --git a/debian/changelog b/debian/changelog
index 26ad855..a84ff32 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,22 @@
+nsict-utils (1.2.8) experimental; urgency=low
+
+  * hush: Preserve leading spaces.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Sun, 07 Oct 2012 15:06:40 +0100
+
+nsict-utils (1.2.7) experimental; urgency=low
+
+  * mtimeout: Various improvements to approach feature-parity with the GNU
+    Coreutils `timeout' program.
+  * prlimit, hush: Various minor bug fixes.
+  * qmail-checkspam: Log envelope and spam score to make diagnosing
+    incorrect rejections easier.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Tue, 14 Feb 2012 10:25:24 +0000
+
 nsict-utils (1.2.6) experimental; urgency=low
 
-  * mtimeout: Rename from timeout to prevent conflict with GNU Coreutils. 
+  * mtimeout: Rename from timeout to prevent conflict with GNU Coreutils.
     This version is slightly better techincally.
   * x86-model: Actually show the stepping number.
   * prlimit: A new Linux-specific program for changing another process's

diff --git a/hush.1.in b/hush.1.in
index 3e3051a..d849700 100644 (file)
--- a/hush.1.in
+++ b/hush.1.in
@@ -46,7 +46,7 @@ version number to standard output, and exit.
 .BI "\-d " directory
 Write log files to
 .I directory
-rather than the default, 
+rather than the default,
 .BR "@logdir@" .
 .TP
 .BI "\-m " email-address

diff --git a/hush.in b/hush.in
index 5e78234..4b3b751 100755 (executable)
--- a/hush.in
+++ b/hush.in
@@ -147,8 +147,8 @@ EOF
 ## substitution.
 rc=$(
   { { { { set +e; $lbuf "$cmd" "$@"; echo $? >&5; } |
-       while read line; do echo "| $line"; done >&4; } 2>&1 |
-      while read line; do echo "* $line"; done >&4; } 4>&1 |
+       while IFS= read line; do echo "| $line"; done >&4; } 2>&1 |
+      while IFS= read line; do echo "* $line"; done >&4; } 4>&1 |
     cat -u >&3; } 5>&1 </dev/null
 )