From 0b3aa702497fe3fa690a31998f3c7aedb96e5c73 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 3 Nov 2017 14:05:59 +1300 Subject: Make d2u(1df)/u2d(1df) like their stream analogues Remove the idempotency guarantee, and simplify the ed(1) scripts. See commits 2905980 and cd8e9cc: >commit 29059804f7708413843687c1764bc845d374a82d >Author: Tom Ryder >Date: Fri Nov 3 13:58:23 2017 > > Remove idempotency assert for sd2u(1df)/su2d(1df) > > Commit cd8e9cc applies a cleaner implementation of these tools but > loses the idempotency: > > * Repeated su2d applications will result in double \r, so \r\r\n > * Repeated s2ru applications will result in an extra newline at the > end of the file, because the whole file will be interpreted as > one line > > However, I am OK with this, as I think of the operation as simpler > and more predictable, and I wouldn't apply it as a means to "force" > a file of unknown or various line-ending types to one type. > >commit cd8e9cc27f7dd9d360b64f4a34b8c2d048f42e45 >Author: Tom Ryder >Date: Fri Nov 3 13:46:30 2017 > > Apply simpler method for sd2u(1df) and su2d(1df) > > This method is shorter, easier to read, and more idiomatic. --- bin/d2u.sh | 2 +- bin/u2d.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/d2u.sh b/bin/d2u.sh index 22c8e16b..892c446b 100644 --- a/bin/d2u.sh +++ b/bin/d2u.sh @@ -16,7 +16,7 @@ for fn ; do # $r within it to get a literal carriage return; the escape characters # prescribed for ed(1) by POSIX are very limited ed -s -- "$fn" <