Module Name: src
Committed By: snj
Date: Tue Jan 9 19:27:41 UTC 2018
Modified Files:
src/external/bsd/nvi/usr.bin/recover [netbsd-8]: virecover
Log Message:
Pull up following revision(s) (requested by christos in ticket #482):
external/bsd/nvi/usr.bin/recover/virecover: revision 1.4
Don't get stuck reading named pipes; only try to read plain files in
order to send mail.
To generate a diff of this commit:
cvs rdiff -u -r1.1.22.1 -r1.1.22.2 \
src/external/bsd/nvi/usr.bin/recover/virecover
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/usr.bin/recover/virecover
diff -u src/external/bsd/nvi/usr.bin/recover/virecover:1.1.22.1 src/external/bsd/nvi/usr.bin/recover/virecover:1.1.22.2
--- src/external/bsd/nvi/usr.bin/recover/virecover:1.1.22.1 Mon Nov 6 09:37:24 2017
+++ src/external/bsd/nvi/usr.bin/recover/virecover Tue Jan 9 19:27:41 2018
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: virecover,v 1.1.22.1 2017/11/06 09:37:24 snj Exp $
+# $NetBSD: virecover,v 1.1.22.2 2018/01/09 19:27:41 snj Exp $
#
# @(#)recover.in 8.8 (Berkeley) 10/10/96
#
@@ -17,13 +17,13 @@ for i in $RECDIR/vi.*; do
esac
# Only test files that are readable.
- if ! [ -f "$i" ] || ! [ -r "$i" ]; then
+ if [ ! -f "$i" ] || [ ! -r "$i" ]; then
continue
fi
# Unmodified nvi editor backup files either have the
# execute bit set or are zero length. Delete them.
- if [ -x "$i" ] || ! [ -s "$i" ]; then
+ if [ -x "$i" ] || [ ! -s "$i" ]; then
rm -f "$i"
fi
done
@@ -36,8 +36,8 @@ for i in $RECDIR/recover.*; do
$RECDIR/recover.\*) continue;;
esac
- # Only test files that are readable.
- if ! [ -r "$i" ]; then
+ # Only test plain files that are readable.
+ if [ ! -f "$i" ] || [ ! -r "$i" ]; then
continue
fi
