Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Jul 2020 00:45:34 +0000 (UTC)
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r363067 - head/usr.bin/xinstall
Message-ID:  <202007100045.06A0jYIX093335@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eugen
Date: Fri Jul 10 00:45:34 2020
New Revision: 363067
URL: https://svnweb.freebsd.org/changeset/base/363067

Log:
  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

Modified:
  head/usr.bin/xinstall/xinstall.c

Modified: head/usr.bin/xinstall/xinstall.c
==============================================================================
--- head/usr.bin/xinstall/xinstall.c	Fri Jul 10 00:45:16 2020	(r363066)
+++ head/usr.bin/xinstall/xinstall.c	Fri Jul 10 00:45:34 2020	(r363067)
@@ -863,7 +863,7 @@ install(const char *from_name, const char *to_name, u_
 			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);
 		}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007100045.06A0jYIX093335>