summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatheus Izvekov <mizvekov@gmail.com>2010-01-19 01:34:29 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-01-20 01:46:14 (GMT)
commit94a6fd1eeb185f8fea5c0906553552fb2a8aa8d0 (patch)
tree74241b70e6a56fcef4f495245b552cf7e7362ac1
parent404f14407c52a994c039dadf7b00df8eb6953d8a (diff)
downloadbusybox-94a6fd1eeb185f8fea5c0906553552fb2a8aa8d0.tar.gz
busybox-94a6fd1eeb185f8fea5c0906553552fb2a8aa8d0.tar.bz2
diff: don't exit in case we can't open input files. -2 bytes
>>From d4cf19d20596bca797d58563f4404cf6a4932977 Mon Sep 17 00:00:00 2001 From: Matheus Izvekov <mizvekov@gmail.com> Date: Mon, 18 Jan 2010 23:27:56 -0200 Subject: [PATCH] diff: don't exit in case we can't open input files This prevents recursion being aborted due to failures to open files. Signed-off-by: Matheus Izvekov <mizvekov@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--editors/diff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/editors/diff.c b/editors/diff.c
index b7a1387..9110982 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -671,14 +671,14 @@ static bool diff(FILE* fp[2], char *file[2])
static int diffreg(char *file[2])
{
- FILE *fp[2];
+ FILE *fp[2] = { stdin, stdin };
bool binary = false, differ = false;
int status = STATUS_SAME;
for (int i = 0; i < 2; i++) {
int fd = open_or_warn_stdin(file[i]);
if (fd == -1)
- xfunc_die();
+ goto out;
/* Our diff implementation is using seek.
* When we meet non-seekable file, we must make a temp copy.
*/
@@ -725,7 +725,7 @@ static int diffreg(char *file[2])
}
if (status != STATUS_SAME)
exit_status |= 1;
-
+out:
fclose_if_not_stdin(fp[0]);
fclose_if_not_stdin(fp[1]);