svn commit: r350633 - stable/12/contrib/elftoolchain/elfcopy

[Mark Johnston]

Author: markj
Date: Tue Aug  6 14:38:44 2019
New Revision: 350633
URL: https://svnweb.freebsd.org/changeset/base/350633

Log:
  MFC r350432:
  Merge r3778 and r3779 from ELFToolchain.

Modified:
  stable/12/contrib/elftoolchain/elfcopy/main.c
  stable/12/contrib/elftoolchain/elfcopy/strip.1
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- stable/12/contrib/elftoolchain/elfcopy/main.c	Tue Aug  6 14:38:16 2019	(r350632)
+++ stable/12/contrib/elftoolchain/elfcopy/main.c	Tue Aug  6 14:38:44 2019	(r350633)
@@ -1187,6 +1187,12 @@ strip_main(struct elfcopy *ecp, int argc, char **argv)
 		ecp->strip = STRIP_ALL;
 	if (optind == argc)
 		strip_usage();
+	/*
+	 * Only accept a single input file if an output file had been
+	 * specified.
+	 */
+	if (outfile != NULL && argc != (optind + 1))
+		strip_usage();
 
 	for (i = optind; i < argc; i++)
 		create_file(ecp, argv[i], outfile);

Modified: stable/12/contrib/elftoolchain/elfcopy/strip.1
==============================================================================
--- stable/12/contrib/elftoolchain/elfcopy/strip.1	Tue Aug  6 14:38:16 2019	(r350632)
+++ stable/12/contrib/elftoolchain/elfcopy/strip.1	Tue Aug  6 14:38:44 2019	(r350633)
@@ -23,7 +23,7 @@
 .\"
 .\" $Id: strip.1 3642 2018-10-14 14:24:28Z jkoshy $
 .\"
-.Dd September 17, 2011
+.Dd July 27, 2019
 .Dt STRIP 1
 .Os
 .Sh NAME
@@ -51,8 +51,16 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility is used to discard information from ELF objects.
+utility is used to discard information from the ELF objects
+specified by the arguments
+.Ar .
 .Pp
+If an explicit output file name is not specified using the
+.Fl o
+option, the
+.Nm
+utility will modify its input arguments in-place.
+.Pp
 The
 .Nm
 utility supports the following options:
@@ -65,8 +73,9 @@ Print a help message and exit.
 Remove all content except that which would be used for debugging.
 .It Fl o Ar outputfile | Fl -output-file= Ns Ar outputfile
 Write the stripped object to file
-.Ar outputfile .
-The default behaviour is to modify objects in place.
+.Ar outputfile
+instead of modifying the input in-place.
+Only a single input object should be specified if this option is used.
 .It Fl p | Fl -preserve-dates
 Preserve the object's access and modification times.
 .It Fl s | Fl -strip-all