From 8eb861b248b1952f347f3535ce3f2396f6827a4c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 17 Jan 2012 23:37:24 -0500
Subject: Fix chardiff (goes neglected until it is needed)

---
 chardiff.sh     | 2 +-
 chardiff_post.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/chardiff.sh b/chardiff.sh
index b6d7403..74c3b2e 100644
--- a/chardiff.sh
+++ b/chardiff.sh
@@ -10,6 +10,6 @@ chardiff_pre < "$file1" > "$tmp1"
 tmp2=`mktemp`
 chardiff_pre < "$file2" > "$tmp2"
 
-wdiff $@ "$tmp1" "$tmp2" | chardiff_post
+wdiff "$@" "$tmp1" "$tmp2" | chardiff_post
 rm "$tmp1" "$tmp2"
 
diff --git a/chardiff_post.c b/chardiff_post.c
index 2145759..c7f543f 100644
--- a/chardiff_post.c
+++ b/chardiff_post.c
@@ -13,12 +13,8 @@ main (int argc, char* argv[]) {
 				case '\\': putchar('\\'); break;
 				default:  putchar(c2);   break;
 			}
-		}
-		char n = getchar();
-		if (n != '\n') {
-			printf(
-				"%s: found other character when expecting newline: %c",
-				argv[0], n);
+		} else if (c!='\n') {
+			putchar(c);
 		}
 	}
 }
-- 
cgit v1.2.3