From 8ce741ca7795f91dc356dbc7931c6fe9143216da Mon Sep 17 00:00:00 2001 From: Eugene Grosbein Date: Fri, 10 Jul 2020 00:45:34 +0000 Subject: [PATCH] install(1): correction after r363064 Make it not break if STRIPBIN points to strip version without -o support. In that case, perform extra copy just like before r363064. MFC after: 1 month X-MFC-With: 363064 --- usr.bin/xinstall/xinstall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 12da91d76aff..1ce0e2ee4a62 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -863,7 +863,7 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) if (dostrip) stripped = strip(tempcopy ? tempfile : to_name, from_name, &digestresult); - else + if (!stripped) digestresult = copy(from_fd, from_name, to_fd, tempcopy ? tempfile : to_name, from_sb.st_size); }