summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/dhclient/conflex.c4
-rw-r--r--sbin/disklabel/editor.c5
-rw-r--r--sbin/dump/dumprmt.c10
-rw-r--r--sbin/dump/optr.c4
-rw-r--r--sbin/dump/tape.c6
-rw-r--r--sbin/dump/traverse.c3
-rw-r--r--sbin/ifconfig/ifconfig.c6
-rw-r--r--sbin/lmccontrol/clockgen.c6
-rw-r--r--sbin/mount_udf/mount_udf.c6
-rw-r--r--sbin/newfs/mkfs.c3
-rw-r--r--sbin/scsi/scsi.c3
11 files changed, 44 insertions, 12 deletions
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index 1cec42ee87e..3d9ee1353f3 100644
--- a/sbin/dhclient/conflex.c
+++ b/sbin/dhclient/conflex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conflex.c,v 1.23 2013/10/22 18:15:58 krw Exp $ */
+/* $OpenBSD: conflex.c,v 1.24 2013/11/12 04:59:00 deraadt Exp $ */
/* Lexical scanner for dhclient config file. */
@@ -355,6 +355,8 @@ static const struct keywords {
{ "token-ring", TOK_TOKEN_RING }
};
+int kw_cmp(const void *k, const void *e);
+
int
kw_cmp(const void *k, const void *e)
{
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index daaa48b997e..c9dd8f140c3 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: editor.c,v 1.276 2013/10/21 07:59:34 otto Exp $ */
+/* $OpenBSD: editor.c,v 1.277 2013/11/12 04:59:02 deraadt Exp $ */
/*
* Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -152,6 +152,8 @@ void set_geometry(struct disklabel *, struct disklabel *, struct disklabel *,
void zero_partitions(struct disklabel *);
u_int64_t max_partition_size(struct disklabel *, int);
void display_edit(struct disklabel *, char, u_int64_t);
+int64_t getphysmem(void);
+void psize(u_int64_t sz, char unit, struct disklabel *lp);
static u_int64_t starting_sector;
static u_int64_t ending_sector;
@@ -512,6 +514,7 @@ getphysmem(void)
int64_t physmem;
size_t sz = sizeof(physmem);
int mib[] = { CTL_HW, HW_PHYSMEM64 };
+
if (sysctl(mib, 2, &physmem, &sz, NULL, (size_t)0) == -1)
errx(4, "can't get mem size");
return physmem;
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index da6a17d07ca..38664f74bdc 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dumprmt.c,v 1.26 2009/10/27 23:59:32 deraadt Exp $ */
+/* $OpenBSD: dumprmt.c,v 1.27 2013/11/12 04:59:02 deraadt Exp $ */
/* $NetBSD: dumprmt.c,v 1.17 1997/06/05 16:10:47 mrg Exp $ */
/*-
@@ -71,6 +71,14 @@ static void rmtgetconn(void);
static void rmtgets(char *, int);
static int rmtreply(char *);
+int rmthost(char *host);
+int rmtopen(char *tape, int mode);
+int rmtread(char *buf, int count);
+int rmtwrite(char *buf, int count);
+int rmtseek(int offset, int pos);
+int rmtioctl(int cmd, int count);
+void rmtclose(void);
+
extern int ntrec; /* blocking factor on tape */
int
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index e86abfac7c6..4e67f11bb77 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: optr.c,v 1.33 2013/04/25 06:43:20 otto Exp $ */
+/* $OpenBSD: optr.c,v 1.34 2013/11/12 04:59:02 deraadt Exp $ */
/* $NetBSD: optr.c,v 1.11 1997/05/27 08:34:36 mrg Exp $ */
/*-
@@ -68,6 +68,8 @@ int datesort(const void *, const void *);
static int timeout;
static char *attnmessage; /* attention message */
+struct fstab *allocfsent(struct fstab *fs);
+
int
query(char *question)
{
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 0094f0948e3..2b001f38da2 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tape.c,v 1.37 2013/11/02 00:08:16 krw Exp $ */
+/* $OpenBSD: tape.c,v 1.38 2013/11/12 04:59:02 deraadt Exp $ */
/* $NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $ */
/*-
@@ -70,6 +70,10 @@ static void flushtape(void);
static void killall(void);
static void rollforward(void);
+void tperror(int signo);
+void sigpipe(int signo);
+void proceed(int signo);
+
/*
* Concurrent dump mods (Caltech) - disk block reading and tape writing
* are exported to several slave processes. While one slave writes the
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 2d35b2cc59d..736922d774c 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: traverse.c,v 1.27 2013/06/11 16:42:04 deraadt Exp $ */
+/* $OpenBSD: traverse.c,v 1.28 2013/11/12 04:59:02 deraadt Exp $ */
/* $NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $ */
/*-
@@ -63,6 +63,7 @@ union dinode {
static int dirindir(ino_t, daddr_t, int, off_t *, off_t *, int);
static void dmpindir(ino_t, daddr_t, int, off_t *);
static int searchdir(ino_t, daddr_t, long, off_t, off_t *, int);
+void fs_mapinodes(ino_t maxino, off_t *tapesize, int *anydirskipped);
/*
* This is an estimation of the number of TP_BSIZE blocks in the file.
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index d58326d6bc0..5180c59b302 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifconfig.c,v 1.276 2013/11/05 21:04:52 bluhm Exp $ */
+/* $OpenBSD: ifconfig.c,v 1.277 2013/11/12 04:59:02 deraadt Exp $ */
/* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */
/*
@@ -540,6 +540,10 @@ void ieee80211_status(void);
void ieee80211_listchans(void);
void ieee80211_listnodes(void);
void ieee80211_printnode(struct ieee80211_nodereq *);
+u_int getwpacipher(const char *name);
+void print_cipherset(u_int32_t cipherset);
+
+void spppauthinfo(struct sauthreq *spa, int d);
/* Known address families */
const struct afswtch {
diff --git a/sbin/lmccontrol/clockgen.c b/sbin/lmccontrol/clockgen.c
index f52489ae143..e583d936105 100644
--- a/sbin/lmccontrol/clockgen.c
+++ b/sbin/lmccontrol/clockgen.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: clockgen.c,v 1.3 2004/08/08 19:04:25 deraadt Exp $ */
-/* $Id: clockgen.c,v 1.3 2004/08/08 19:04:25 deraadt Exp $ */
+/* $OpenBSD: clockgen.c,v 1.4 2013/11/12 04:59:02 deraadt Exp $ */
+/* $Id: clockgen.c,v 1.4 2013/11/12 04:59:02 deraadt Exp $ */
/*-
* Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@@ -53,6 +53,8 @@
typedef struct lmc___ctl lmc_ctl_t;
#include <dev/pci/if_lmcioctl.h>
+void lmc_av9110_freq(u_int32_t target, lmc_av9110_t *av);
+
#define T1_FREF 20000000
#define T1_FMIN 30000000
#define T1_FMAX 330000000
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
index 1cf6e8722f6..64c44d4e677 100644
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_udf.c,v 1.5 2007/12/09 20:54:01 jmc Exp $ */
+/* $OpenBSD: mount_udf.c,v 1.6 2013/11/12 04:59:02 deraadt Exp $ */
/*
* Copyright (c) 2005 Pedro Martelletto <pedro@ambientworks.net>
@@ -32,6 +32,10 @@
const struct mntopt opts[] = { MOPT_STDOPTS, { NULL } };
+u_int32_t lastblock(char *dev);
+__dead void usage(void);
+
+
__dead void
usage(void)
{
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 618f147a63d..38c8a5cba52 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkfs.c,v 1.83 2013/11/03 02:22:07 krw Exp $ */
+/* $OpenBSD: mkfs.c,v 1.84 2013/11/12 04:59:02 deraadt Exp $ */
/* $NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $ */
/*
@@ -144,6 +144,7 @@ static void checksz(void);
#ifndef STANDALONE
volatile sig_atomic_t cur_cylno;
volatile const char *cur_fsys;
+void siginfo(int sig);
void
siginfo(int sig)
diff --git a/sbin/scsi/scsi.c b/sbin/scsi/scsi.c
index 62ef140138c..2775e2c4b84 100644
--- a/sbin/scsi/scsi.c
+++ b/sbin/scsi/scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi.c,v 1.27 2012/09/03 20:46:44 okan Exp $ */
+/* $OpenBSD: scsi.c,v 1.28 2013/11/12 04:59:02 deraadt Exp $ */
/* $FreeBSD: scsi.c,v 1.11 1996/04/06 11:00:28 joerg Exp $ */
/*
@@ -78,6 +78,7 @@ char *cget(void *hook, char *name);
void arg_put(void *hook, int letter, void *arg, int count, char *name);
void mode_sense(int fd, u_char *data, int len, int pc, int page);
void mode_select(int fd, u_char *data, int len, int perm);
+int editit(const char *pathname);
static void
usage(void)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 09:14:52 +0000