Merge ping6 to ping
The front end code parses only -4 and -6 options, and decides whether to call ping or ping6.
Submitted by: Ján Sučan <sucanjan@gmail.com>
Sponsored by: Google LLC (Google Summer of Code 2019)
Paths
| Differential D21377 Authored by asomers on Aug 23 2019, 2:09 PM.
Details
Summary Merge ping6 to ping The front end code parses only -4 and -6 options, and decides whether to call ping or ping6. Submitted by: Ján Sučan <sucanjan@gmail.com>
Diff Detail
Event TimelineThere are a very large number of changes, so older changes are hidden. Show Older Changes
This revision now requires changes to proceed.Aug 23 2019, 4:25 PM2019-08-23 16:25:30 (UTC+0) Harbormaster completed remote builds in B26042: Diff 61175.Aug 23 2019, 4:53 PM2019-08-23 16:53:43 (UTC+0) Harbormaster completed remote builds in B26043: Diff 61176.Aug 23 2019, 5:05 PM2019-08-23 17:05:18 (UTC+0) Harbormaster completed remote builds in B26044: Diff 61177.Aug 23 2019, 5:10 PM2019-08-23 17:10:15 (UTC+0) Harbormaster completed remote builds in B26046: Diff 61179.Aug 23 2019, 5:38 PM2019-08-23 17:38:03 (UTC+0)
Comment Actions Now it doesn't even build: /usr/home/somers/freebsd/base/head/sbin/ping/main.c:249:1: error: redefinition of 'main' main(int argc, char *argv[]) ^ /usr/home/somers/freebsd/base/head/sbin/ping/main.c:59:1: note: previous definition is here main(int argc, char *argv[]) ^ /usr/home/somers/freebsd/base/head/sbin/ping/main.c:331:1: error: redefinition of 'usage' usage(void) ^ /usr/home/somers/freebsd/base/head/sbin/ping/main.c:141:1: note: previous definition is here usage(void) ^ 2 errors generated. Comment Actions It will take me some time to find out why. On my system it builds. Could you please send me your main.c? It's interesting that there are double definitions of the functions. Comment Actions
Sorry, my bad. It's a side effect of arcanist. If you apply a patch, revert the directory, and reapply the patch, any newly created file gets doubled. You need to rm newly created files after "svn revert". I forgot to do that. Harbormaster completed remote builds in B26049: Diff 61187.Aug 23 2019, 8:10 PM2019-08-23 20:10:52 (UTC+0)
Comment Actions
It's OK. This information could be helpful if I'll work with svn.
Harbormaster completed remote builds in B26062: Diff 61205.Aug 24 2019, 6:43 AM2019-08-24 06:43:40 (UTC+0) Comment Actions You still need to add entries to UPDATING and ObsoleteFiles.inc. Other than that, it looks good.
This revision now requires changes to proceed.Aug 24 2019, 3:13 PM2019-08-24 15:13:14 (UTC+0) Comment Actions Add entries to UPDATING and ObsoleteFiles.inc. Harbormaster completed remote builds in B26087: Diff 61243.Aug 24 2019, 8:33 PM2019-08-24 20:33:46 (UTC+0) Comment Actions Is there any interest to get this into -CURRENT? I am working on a few small ping updates that could be benefit from getting this into tree first. Comment Actions Thanks for reminding me, @gbe . I think I'll have time to work on this on Halloween weekend. Feel free to remind me if I haven't done anything by November. Comment Actions
This is friendly reminder! :) Comment Actions Arcanist won't let me update the review because of this bug: https://secure.phabricator.com/T10608 . But the required changes are small enough that I don't think they need additional review. There were a few related to rebasing. And there were a few changes required to fix the tests. I'll commit them if the tinderbox build passes. This revision was not accepted when it landed; it landed in state Needs Review.Dec 8 2020, 6:43 PM2020-12-08 18:43:44 (UTC+0) This revision was automatically updated to reflect the committed changes. Herald added a reviewer: manpages. · View Herald TranscriptDec 8 2020, 6:43 PM2020-12-08 18:43:45 (UTC+0)
Revision Contents
Diff 61179 etc/mtree/BSD.tests.dist
rescue/rescue/Makefile
sbin/Makefile
sbin/ping/Makefile
|
The credit will alreay be present in the commit message, please do not add more in the Makefile.