From f40819b14323ac45659b2a87469e22e62a632b7c Mon Sep 17 00:00:00 2001 From: kevans Date: Thu, 4 Apr 2019 17:21:30 +0000 Subject: [PATCH] MFC r344677: patch(1): Exit successfully if we're fed a 0-length patch This change is made in the name of GNU patch compatibility. If GNU patch is fed a zero-length patch, it will exit successfully with no output. This is used in at least one port to date (comms/wsjtx), and we break on this usage. It seems unlikely that anyone relies on patch(1) calling their completely empty patch garbage and failing, and GNU compatibility is a plus if it helps with porting, so make the switch. --- usr.bin/patch/common.h | 1 + usr.bin/patch/patch.c | 3 ++- usr.bin/patch/pch.c | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.bin/patch/common.h b/usr.bin/patch/common.h index 1e69ee9b07f..3253df27e68 100644 --- a/usr.bin/patch/common.h +++ b/usr.bin/patch/common.h @@ -64,6 +64,7 @@ extern size_t buf_size; /* size of general purpose buffer */ extern bool using_plan_a; /* try to keep everything in memory */ extern bool out_of_mem; /* ran out of memory in plan a */ +extern bool nonempty_patchf_seen; /* seen a non-zero-length patch file? */ #define MAXFILEC 2 diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c index b52919fe046..8342dba688b 100644 --- a/usr.bin/patch/patch.c +++ b/usr.bin/patch/patch.c @@ -53,6 +53,7 @@ size_t buf_size; /* size of the general purpose buffer */ bool using_plan_a = true; /* try to keep everything in memory */ bool out_of_mem = false; /* ran out of memory in plan a */ +bool nonempty_patchf_seen = false; /* seen nonempty patch file? */ #define MAXFILEC 2 @@ -419,7 +420,7 @@ main(int argc, char *argv[]) set_signals(1); } - if (!patch_seen) + if (!patch_seen && nonempty_patchf_seen) error = 2; my_exit(error); diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index 0b583ea7eb3..50e1604b9b9 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -179,6 +179,9 @@ there_is_another_patch(void) say("done\n"); return false; } + if (p_filesize == 0) + return false; + nonempty_patchf_seen = true; if (verbose) say("Hmm..."); diff_type = intuit_diff_type(); -- 2.45.0