diff options
| -rw-r--r-- | usr.bin/bc/bc.y | 4 | ||||
| -rw-r--r-- | usr.bin/bc/tty.c | 4 | ||||
| -rw-r--r-- | usr.bin/cu/command.c | 4 | ||||
| -rw-r--r-- | usr.bin/cu/xmodem.c | 7 | ||||
| -rw-r--r-- | usr.bin/encrypt/encrypt.c | 5 | ||||
| -rw-r--r-- | usr.bin/midiplay/midiplay.c | 3 | ||||
| -rw-r--r-- | usr.bin/pkill/pkill.c | 4 | ||||
| -rw-r--r-- | usr.bin/vis/foldit.c | 8 | ||||
| -rw-r--r-- | usr.bin/wc/wc.c | 3 |
9 files changed, 27 insertions, 15 deletions
diff --git a/usr.bin/bc/bc.y b/usr.bin/bc/bc.y index fe850368ae7..f9b80bc5b97 100644 --- a/usr.bin/bc/bc.y +++ b/usr.bin/bc/bc.y @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: bc.y,v 1.42 2013/09/19 16:12:01 otto Exp $ */ +/* $OpenBSD: bc.y,v 1.43 2013/11/12 13:54:51 deraadt Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek <otto@drijf.net> @@ -1057,7 +1057,7 @@ escape(const char *str) } /* ARGSUSED */ -void +static void sigchld(int signo) { pid_t pid; diff --git a/usr.bin/bc/tty.c b/usr.bin/bc/tty.c index ffba1d5d18a..6bc85332580 100644 --- a/usr.bin/bc/tty.c +++ b/usr.bin/bc/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.1 2013/09/19 16:12:01 otto Exp $ */ +/* $OpenBSD: tty.c,v 1.2 2013/11/12 13:54:51 deraadt Exp $ */ /* * Copyright (c) 2013, Otto Moerbeek <otto@drijf.net> @@ -24,7 +24,7 @@ struct termios ttysaved, ttyedit; -int +static int settty(struct termios *t) { int ret; diff --git a/usr.bin/cu/command.c b/usr.bin/cu/command.c index 54e6490ca19..5c6a1f09399 100644 --- a/usr.bin/cu/command.c +++ b/usr.bin/cu/command.c @@ -1,4 +1,4 @@ -/* $OpenBSD: command.c,v 1.12 2012/07/15 06:55:28 nicm Exp $ */ +/* $OpenBSD: command.c,v 1.13 2013/11/12 13:54:51 deraadt Exp $ */ /* * Copyright (c) 2012 Nicholas Marriott <nicm@openbsd.org> @@ -36,6 +36,8 @@ void pipe_command(void); void connect_command(void); void send_file(void); void send_xmodem(void); +void set_speed(void); +void start_record(void); void pipe_command(void) diff --git a/usr.bin/cu/xmodem.c b/usr.bin/cu/xmodem.c index b0427acf5bb..c42441feb05 100644 --- a/usr.bin/cu/xmodem.c +++ b/usr.bin/cu/xmodem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xmodem.c,v 1.5 2013/07/20 19:27:47 naddy Exp $ */ +/* $OpenBSD: xmodem.c,v 1.6 2013/11/12 13:54:51 deraadt Exp $ */ /* * Copyright (c) 2012 Nicholas Marriott <nicm@openbsd.org> @@ -39,6 +39,11 @@ volatile sig_atomic_t xmodem_stop; +void xmodem_signal(int sig); +uint16_t xmodem_crc16(const u_char *buf, size_t len); +int xmodem_read(char *c); +int xmodem_write(const u_char *buf, size_t len); + void xmodem_signal(int sig) { diff --git a/usr.bin/encrypt/encrypt.c b/usr.bin/encrypt/encrypt.c index f62634f20b3..06411ae8144 100644 --- a/usr.bin/encrypt/encrypt.c +++ b/usr.bin/encrypt/encrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: encrypt.c,v 1.29 2013/05/23 01:33:08 tedu Exp $ */ +/* $OpenBSD: encrypt.c,v 1.30 2013/11/12 13:54:51 deraadt Exp $ */ /* * Copyright (c) 1996, Jason Downs. All rights reserved. @@ -51,6 +51,7 @@ extern char *__progname; char buffer[_PASSWORD_LEN]; void usage(void); +int ideal_rounds(void); void print_passwd(char *, int, void *); void @@ -68,7 +69,7 @@ usage(void) * We are aiming for something that takes between 0.25 and 0.5 seconds. */ int -ideal_rounds() +ideal_rounds(void) { clock_t before, after; int r = 8; diff --git a/usr.bin/midiplay/midiplay.c b/usr.bin/midiplay/midiplay.c index bcc26e6c8f7..fe5b77501ff 100644 --- a/usr.bin/midiplay/midiplay.c +++ b/usr.bin/midiplay/midiplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midiplay.c,v 1.15 2012/01/26 04:17:04 lum Exp $ */ +/* $OpenBSD: midiplay.c,v 1.16 2013/11/12 13:54:51 deraadt Exp $ */ /* $NetBSD: midiplay.c,v 1.8 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -85,6 +85,7 @@ void midireset(void); u_long getvar(struct track *); void playfile(FILE *, char *); void playdata(u_char *, u_int, char *); +void sigalrm(int); int main(int argc, char **argv); extern char *__progname; diff --git a/usr.bin/pkill/pkill.c b/usr.bin/pkill/pkill.c index 931a7235c34..de908d79a84 100644 --- a/usr.bin/pkill/pkill.c +++ b/usr.bin/pkill/pkill.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkill.c,v 1.33 2013/09/22 17:28:34 guenther Exp $ */ +/* $OpenBSD: pkill.c,v 1.34 2013/11/12 13:54:51 deraadt Exp $ */ /* $NetBSD: pkill.c,v 1.5 2002/10/27 11:49:34 kleink Exp $ */ /*- @@ -106,6 +106,8 @@ void usage(void); int killact(struct kinfo_proc *, int); int grepact(struct kinfo_proc *, int); void makelist(struct listhead *, enum listtype, char *); +char *getargv(struct kinfo_proc *); +int askyn(struct kinfo_proc *); extern char *__progname; diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c index e8c66d443cd..5ae3f863695 100644 --- a/usr.bin/vis/foldit.c +++ b/usr.bin/vis/foldit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: foldit.c,v 1.5 2009/10/27 23:59:49 deraadt Exp $ */ +/* $OpenBSD: foldit.c,v 1.6 2013/11/12 13:54:51 deraadt Exp $ */ /* $NetBSD: foldit.c,v 1.4 1994/12/20 16:13:02 jtc Exp $ */ /*- @@ -32,10 +32,10 @@ #include <stdio.h> +int foldit(char *chunk, int col, int max); + int -foldit(chunk, col, max) - char *chunk; - int col, max; +foldit(char *chunk, int col, int max) { char *cp; diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 52689c9e6da..81fc5cfdaa6 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wc.c,v 1.13 2009/10/27 23:59:49 deraadt Exp $ */ +/* $OpenBSD: wc.c,v 1.14 2013/11/12 13:54:50 deraadt Exp $ */ /* * Copyright (c) 1980, 1987, 1991, 1993 @@ -47,6 +47,7 @@ int rval; extern char *__progname; void print_counts(int64_t, int64_t, int64_t, char *); +void format_and_print(long long); void cnt(char *); int |