Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge lite2 changes

This commit is contained in:
mikel 1997-03-07 07:04:42 +00:00
parent e1525d735d
commit 38e37321ab
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/arp/arp.8
View File

@ -1,4 +1,4 @@
.\" $NetBSD: arp.8,v 1.7 1995/03/01 11:50:59 chopps Exp $
.\" $NetBSD: arp.8,v 1.8 1997/03/07 07:04:42 mikel Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@ -31,9 +31,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" from: @(#)arp.8 8.1 (Berkeley) 6/6/93
.\" from: @(#)arp.8 8.2 (Berkeley) 4/27/95
.\"
.Dd June 6, 1993
.Dd April 27, 1995
.Dt ARP 8
.Os BSD 4.3
.Sh NAME

30
usr.sbin/arp/arp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: arp.c,v 1.15 1997/02/07 05:07:13 mikel Exp $ */
/* $NetBSD: arp.c,v 1.16 1997/03/07 07:04:43 mikel Exp $ */
/*
* Copyright (c) 1984, 1993
@ -43,8 +43,8 @@ static char copyright[] =
#endif /* not lint */
#ifndef lint
/*static char sccsid[] = "from: @(#)arp.c 8.2 (Berkeley) 1/2/94";*/
static char *rcsid = "$NetBSD: arp.c,v 1.15 1997/02/07 05:07:13 mikel Exp $";
/* static char sccsid[] = "@(#)arp.c 8.3 (Berkeley) 4/28/95"; */
static char *rcsid = "$NetBSD: arp.c,v 1.16 1997/03/07 07:04:43 mikel Exp $";
#endif /* not lint */
/*
@ -74,21 +74,21 @@ static char *rcsid = "$NetBSD: arp.c,v 1.15 1997/02/07 05:07:13 mikel Exp $";
#include <string.h>
#include <unistd.h>
int delete __P((const char *, const char *));
void dump __P((u_long));
void ether_print __P((const u_char *));
int file __P((char *));
void get __P((const char *));
int getinetaddr __P((const char *, struct in_addr *));
void getsocket __P((void));
int rtmsg __P((int));
int set __P((int, char **));
void usage __P((void));
static int pid;
static int nflag;
static int s = -1;
int delete __P((const char *, const char *));
void dump __P((u_long));
void ether_print __P((const u_char *));
int file __P((char *));
void get __P((const char *));
int getinetaddr __P((const char *, struct in_addr *));
void getsocket __P((void));
int rtmsg __P((int));
int set __P((int, char **));
void usage __P((void));
int
main(argc, argv)
int argc;
@ -413,7 +413,7 @@ dump(addr)
}
(void)printf("%s (%s) at ", host, inet_ntoa(sin->sin_addr));
if (sdl->sdl_alen)
ether_print(LLADDR(sdl));
ether_print((u_char *)LLADDR(sdl));
else
(void)printf("(incomplete)");
if (rtm->rtm_rmx.rmx_expire == 0)