On Tue, Jun 13, 2017 at 10:45:57AM -0600, Theo de Raadt wrote:
Sorry, but that type of diff is a no-go. You've made a large variety
of different decisions on your own and mixed them up with ones which
are personal taste, and then touched so many lines of the code that
future study of historical changes in the code will be confusing.
Points taken.
The right approach is seperate changes into seperate catagories with
seperate explanations. So I suggest you start with the ones of most
importance, and don't mix it with fluff (that's what we call it).
Each of the following patches applies cleanly on its own.
Starting with this one replacing perror(3) with err(1).
Index: ping.c
===================================================================
RCS file: /cvs/src/sbin/ping/ping.c,v
retrieving revision 1.218
diff -u -p -r1.218 ping.c
--- ping.c 22 Feb 2017 13:43:35 -0000 1.218
+++ ping.c 13 Jun 2017 17:28:46 -0000
@@ -729,10 +729,8 @@ main(int argc, char *argv[])
rspace[IPOPT_OLEN] = sizeof(rspace)-1;
rspace[IPOPT_OFFSET] = IPOPT_MINOFF;
if (setsockopt(s, IPPROTO_IP, IP_OPTIONS, rspace,
- sizeof(rspace)) < 0) {
- perror("ping: record route");
- exit(1);
- }
+ sizeof(rspace)) < 0)
+ err(1, "record route");
}
if ((moptions & MULTICAST_NOLOOP) &&
