On Mon, Jul 13, 2015 at 02:04:40PM +0100, Dimitris Papastamos wrote: > Hi, > > I noticed -f in ndp(8) did nothing at all so I've enabled it and > documented the file syntax in the man page. > > =================================================================== > RCS file: /cvs/src/usr.sbin/ndp/ndp.8,v > retrieving revision 1.33 > diff -u -p -r1.33 ndp.8 > --- ndp.8 3 Sep 2014 10:39:41 -0000 1.33 > +++ ndp.8 13 Jul 2015 13:02:49 -0000 > @@ -122,6 +122,12 @@ Delete the specified NDP entry. > .It Fl f Ar filename > Parse the file specified by > .Ar filename . > +Entries in the file should be of the form: > +.Bd -ragged -offset indent -compact > +.Ar nodename etheraddr > +.Op Ar temp > +.Op Ar proxy > +.Ed > .It Fl H > Harmonize consistency between the routing table and the default router > list; install the top entry of the list into the kernel routing table. > Index: ndp.c > =================================================================== > RCS file: /cvs/src/usr.sbin/ndp/ndp.c,v > retrieving revision 1.61 > diff -u -p -r1.61 ndp.c > --- ndp.c 3 Jun 2015 08:10:53 -0000 1.61 > +++ ndp.c 13 Jul 2015 13:02:49 -0000 > @@ -241,6 +241,8 @@ main(int argc, char *argv[]) > } > delete(arg); > break; > + case 'f': > + exit(file(arg) ? 1 : 0); > case 'p': > if (argc != 0) { > usage(); >
Is this ok? Looking at it, it should just be exit(file(arg)) as file() only returns 0 for success and 1 on failure.