summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/fdisk/disk.c5
-rw-r--r--sbin/fdisk/fdisk.c5
-rw-r--r--sbin/fdisk/part.c3
-rw-r--r--sbin/ipsecadm/ipsecadm.c7
-rw-r--r--sbin/ipsecadm/pfkdump.c15
-rw-r--r--sbin/kbd/kbd_wscons.c6
-rw-r--r--sbin/modunload/modunload.c4
-rw-r--r--sbin/newfs/mkfs.c7
-rw-r--r--sbin/newfs/newfs.c6
-rw-r--r--sbin/ping/ping.c5
-rw-r--r--sbin/route/route.c12
-rw-r--r--sbin/route/show.c5
-rw-r--r--sbin/scan_ffs/scan_ffs.c6
-rw-r--r--sbin/wicontrol/wicontrol.c6
14 files changed, 64 insertions, 28 deletions
diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c
index a48628b7a3f..33ec0975cb2 100644
--- a/sbin/fdisk/disk.c
+++ b/sbin/fdisk/disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.c,v 1.18 2003/06/11 06:22:12 deraadt Exp $ */
+/* $OpenBSD: disk.c,v 1.19 2003/07/02 21:44:57 deraadt Exp $ */
/*
* Copyright (c) 1997, 2001 Tobias Weingartner
@@ -45,6 +45,9 @@
#include "disk.h"
#include "misc.h"
+DISK_metrics *DISK_getlabelmetrics(char *name);
+DISK_metrics *DISK_getbiosmetrics(char *name);
+
int
DISK_open(char *disk, int mode)
{
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index f405c3b1e8c..e7b8dfc5a40 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fdisk.c,v 1.36 2003/06/11 06:22:12 deraadt Exp $ */
+/* $OpenBSD: fdisk.c,v 1.37 2003/07/02 21:44:57 deraadt Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -42,8 +42,7 @@ static unsigned char builtin_mbr[] = {
#include "mbrcode.h"
};
-
-void
+static void
usage(void)
{
extern char * __progname;
diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c
index 5292eab5f24..2e187024d17 100644
--- a/sbin/fdisk/part.c
+++ b/sbin/fdisk/part.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: part.c,v 1.34 2003/06/11 06:22:12 deraadt Exp $ */
+/* $OpenBSD: part.c,v 1.35 2003/07/02 21:44:57 deraadt Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -39,6 +39,7 @@
#include "misc.h"
#include "mbr.h"
+int PRT_check_chs(prt_t *partn);
static const struct part_type {
int type;
diff --git a/sbin/ipsecadm/ipsecadm.c b/sbin/ipsecadm/ipsecadm.c
index d6208422fc1..cc2a4bb4d09 100644
--- a/sbin/ipsecadm/ipsecadm.c
+++ b/sbin/ipsecadm/ipsecadm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsecadm.c,v 1.66 2003/02/25 22:29:33 markus Exp $ */
+/* $OpenBSD: ipsecadm.c,v 1.67 2003/07/02 21:44:57 deraadt Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -114,6 +114,11 @@ transform xf[] = {
extern void ipsecadm_monitor(void);
extern void ipsecadm_show(u_int8_t);
+int addrparse(const char *, struct sockaddr *, struct sockaddr *);
+void xf_set(struct iovec *, int, int);
+int x2i(char *);
+int isvalid(char *, int, int);
+void usage(void);
/*
* returns 0 if "str" represents an address, returns 1 if address/mask,
diff --git a/sbin/ipsecadm/pfkdump.c b/sbin/ipsecadm/pfkdump.c
index e769b19564c..ed6c3263e97 100644
--- a/sbin/ipsecadm/pfkdump.c
+++ b/sbin/ipsecadm/pfkdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkdump.c,v 1.4 2003/06/10 16:41:28 deraadt Exp $ */
+/* $OpenBSD: pfkdump.c,v 1.5 2003/07/02 21:44:57 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
@@ -53,6 +53,19 @@ void print_policy(struct sadb_ext *, struct sadb_msg *);
void print_cred(struct sadb_ext *, struct sadb_msg *);
void print_auth(struct sadb_ext *, struct sadb_msg *);
+struct idname *lookup(struct idname [], u_int8_t);
+char *lookup_name(struct idname [], u_int8_t);
+void print_ext(struct sadb_ext *, struct sadb_msg *);
+void print_msg(struct sadb_msg *, int);
+char *alg_by_ext(u_int8_t, u_int8_t);
+void print_alg(struct sadb_alg *, u_int8_t);
+void print_comb(struct sadb_comb *, struct sadb_msg *);
+void msg_send(int, u_int8_t, u_int8_t);
+void msg_read(int);
+void do_pfkey(int, u_int8_t);
+void ipsecadm_monitor(void);
+void ipsecadm_show(u_int8_t);
+
struct idname {
u_int8_t id;
char *name;
diff --git a/sbin/kbd/kbd_wscons.c b/sbin/kbd/kbd_wscons.c
index 0acd17e1c61..c600abb9e90 100644
--- a/sbin/kbd/kbd_wscons.c
+++ b/sbin/kbd/kbd_wscons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kbd_wscons.c,v 1.13 2003/06/02 21:10:37 maja Exp $ */
+/* $OpenBSD: kbd_wscons.c,v 1.14 2003/07/02 21:44:58 deraadt Exp $ */
/*
* Copyright (c) 2001 Mats O Jansson. All rights reserved.
@@ -93,6 +93,10 @@ struct nameint kbdvar_tab[] = {
extern char *__progname;
int rebuild = 0;
+void kbd_show_enc(kvm_t *kd, int idx);
+void kbd_list(void);
+void kbd_set(char *name, int verbose);
+
#ifndef NOKVM
void
kbd_show_enc(kvm_t *kd, int idx)
diff --git a/sbin/modunload/modunload.c b/sbin/modunload/modunload.c
index d7d167987d4..c0e2b9dccf7 100644
--- a/sbin/modunload/modunload.c
+++ b/sbin/modunload/modunload.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: modunload.c,v 1.12 2003/01/18 23:30:20 deraadt Exp $ */
+/* $OpenBSD: modunload.c,v 1.13 2003/07/02 21:44:58 deraadt Exp $ */
/* $NetBSD: modunload.c,v 1.9 1995/05/28 05:23:05 jtc Exp $ */
/*
@@ -62,7 +62,7 @@ usage(void)
exit(1);
}
-void
+static void
cleanup(void)
{
(void)close(devfd);
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 60b50585e81..91680d704fc 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkfs.c,v 1.30 2003/06/25 21:24:10 deraadt Exp $ */
+/* $OpenBSD: mkfs.c,v 1.31 2003/07/02 21:44:58 deraadt Exp $ */
/* $NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)mkfs.c 8.3 (Berkeley) 2/3/94";
#else
-static char rcsid[] = "$OpenBSD: mkfs.c,v 1.30 2003/06/25 21:24:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkfs.c,v 1.31 2003/07/02 21:44:58 deraadt Exp $";
#endif
#endif /* not lint */
@@ -136,6 +136,7 @@ void setblock(struct fs *, unsigned char *, int);
void clrblock(struct fs *, unsigned char *, int);
int isblock(struct fs *, unsigned char *, int);
void rdfs(daddr_t, int, void *);
+void mkfs(struct partition *pp, char *fsys, int fi, int fo);
void
mkfs(struct partition *pp, char *fsys, int fi, int fo)
@@ -145,8 +146,6 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo)
long used, mincpgcnt, bpcg;
long mapcramped, inodecramped;
long postblsize, rotblsize, totalsbsize;
- pid_t ppid = -1;
- int status;
time_t utime;
quad_t sizepb;
int width;
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 4d2cdf7a042..3694c823e72 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: newfs.c,v 1.42 2003/06/25 21:24:10 deraadt Exp $ */
+/* $OpenBSD: newfs.c,v 1.43 2003/07/02 21:44:58 deraadt Exp $ */
/* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */
/*
@@ -40,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94";
#else
-static char rcsid[] = "$OpenBSD: newfs.c,v 1.42 2003/06/25 21:24:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: newfs.c,v 1.43 2003/07/02 21:44:58 deraadt Exp $";
#endif
#endif /* not lint */
@@ -186,6 +186,7 @@ int unlabeled;
char device[MAXPATHLEN];
extern char *__progname;
+struct disklabel *getdisklabel(char *, int);
int
main(int argc, char *argv[])
@@ -194,7 +195,6 @@ main(int argc, char *argv[])
struct partition *pp;
struct disklabel *lp;
struct disklabel mfsfakelabel;
- struct disklabel *getdisklabel(char *, int);
struct partition oldpartition;
struct stat st;
struct statfs *mp;
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index d6eddb22bbf..d2e4033a8ea 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping.c,v 1.61 2003/06/11 06:22:14 deraadt Exp $ */
+/* $OpenBSD: ping.c,v 1.62 2003/07/02 21:44:58 deraadt Exp $ */
/* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */
/*
@@ -43,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93";
#else
-static char rcsid[] = "$OpenBSD: ping.c,v 1.61 2003/06/11 06:22:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ping.c,v 1.62 2003/07/02 21:44:58 deraadt Exp $";
#endif
#endif /* not lint */
@@ -177,6 +177,7 @@ void pr_icmph(struct icmp *);
void pr_pack(char *, int, struct sockaddr_in *);
void pr_retip(struct ip *);
quad_t qsqrt(quad_t);
+void pr_iph(struct ip *);
void usage(void);
int
diff --git a/sbin/route/route.c b/sbin/route/route.c
index aa5d3af82bf..7a5ccba5184 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.58 2003/06/26 16:35:21 deraadt Exp $ */
+/* $OpenBSD: route.c,v 1.59 2003/07/02 21:44:58 deraadt Exp $ */
/* $NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $ */
/*
@@ -40,7 +40,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)route.c 8.3 (Berkeley) 3/19/94";
#else
-static const char rcsid[] = "$OpenBSD: route.c,v 1.58 2003/06/26 16:35:21 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: route.c,v 1.59 2003/07/02 21:44:58 deraadt Exp $";
#endif
#endif /* not lint */
@@ -115,6 +115,14 @@ static int inet6_makenetandmask(struct sockaddr_in6 *);
int getaddr(int, char *, struct hostent **);
int rtmsg(int, int);
int x25_makemask(void);
+__dead void usage(char *cp);
+void quit(char *s);
+char *any_ntoa(const struct sockaddr *sa);
+void set_metric(char *value, int key);
+void inet_makenetandmask(u_int32_t net, struct sockaddr_in *sin, int bits);
+char *ns_print(struct sockaddr_ns *sns);
+char *ipx_print(struct sockaddr_ipx *sipx);
+void interfaces(void);
extern void show(int, char **); /* XXX - from show.c */
diff --git a/sbin/route/show.c b/sbin/route/show.c
index f04673fdef8..d325e49fe39 100644
--- a/sbin/route/show.c
+++ b/sbin/route/show.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: show.c,v 1.24 2003/06/26 16:35:21 deraadt Exp $ */
+/* $OpenBSD: show.c,v 1.25 2003/07/02 21:44:58 deraadt Exp $ */
/* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94";
#else
-static char *rcsid = "$OpenBSD: show.c,v 1.24 2003/06/26 16:35:21 deraadt Exp $";
+static char *rcsid = "$OpenBSD: show.c,v 1.25 2003/07/02 21:44:58 deraadt Exp $";
#endif
#endif /* not lint */
@@ -106,6 +106,7 @@ static void pr_family(int);
int keyword(char *);
void usage(char *);
+void show(int argc, char *argv[]);
/*
* Print routing tables.
diff --git a/sbin/scan_ffs/scan_ffs.c b/sbin/scan_ffs/scan_ffs.c
index 4aaa0f62671..70ca5245f0f 100644
--- a/sbin/scan_ffs/scan_ffs.c
+++ b/sbin/scan_ffs/scan_ffs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scan_ffs.c,v 1.9 2003/06/03 00:33:34 weingart Exp $ */
+/* $OpenBSD: scan_ffs.c,v 1.10 2003/07/02 21:44:58 deraadt Exp $ */
/*
* Copyright (c) 1998 Niklas Hallqvist, Tobias Weingartner
@@ -44,7 +44,7 @@
#define FLAG_SMART 2
#define FLAG_LABELS 4
-int
+static int
ufsscan(int fd, daddr_t beg, daddr_t end, int flags)
{
static char lastmount[MAXMNTLEN];
@@ -112,7 +112,7 @@ ufsscan(int fd, daddr_t beg, daddr_t end, int flags)
}
-void
+static void
usage(int code)
{
extern char *__progname;
diff --git a/sbin/wicontrol/wicontrol.c b/sbin/wicontrol/wicontrol.c
index b0acb8cac97..f461b23e59a 100644
--- a/sbin/wicontrol/wicontrol.c
+++ b/sbin/wicontrol/wicontrol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wicontrol.c,v 1.45 2003/06/07 21:14:42 mickey Exp $ */
+/* $OpenBSD: wicontrol.c,v 1.46 2003/07/02 21:44:58 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -69,7 +69,7 @@
static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
Bill Paul. All rights reserved.";
static const char rcsid[] =
- "@(#) $OpenBSD: wicontrol.c,v 1.45 2003/06/07 21:14:42 mickey Exp $";
+ "@(#) $OpenBSD: wicontrol.c,v 1.46 2003/07/02 21:44:58 deraadt Exp $";
#endif
void wi_getval(char *, struct wi_req *);
@@ -95,6 +95,8 @@ __dead void usage(void);
char *portid(char *);
int get_if_flags(int, const char *);
int set_if_flags(int, const char *, int);
+int wi_hex2int(char c);
+void wi_str2key(char *s, struct wi_key *k);
const struct wi_card_ident wi_card_ident[] = {
WI_CARD_IDS
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 03:03:36 +0000