diff options
Diffstat (limited to 'bin')
76 files changed, 1006 insertions, 1006 deletions
diff --git a/bin/cat/cat.c b/bin/cat/cat.c index b4d072e24ff..227d11b6c5b 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cat.c,v 1.11 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: cat.c,v 1.12 2002/02/16 21:27:05 millert Exp $ */ /* $NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; #else -static char rcsid[] = "$OpenBSD: cat.c,v 1.11 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: cat.c,v 1.12 2002/02/16 21:27:05 millert Exp $"; #endif #endif /* not lint */ @@ -70,10 +70,10 @@ int bflag, eflag, nflag, sflag, tflag, vflag; int rval; char *filename; -void cook_args __P((char *argv[])); -void cook_buf __P((FILE *)); -void raw_args __P((char *argv[])); -void raw_cat __P((int)); +void cook_args(char *argv[]); +void cook_buf(FILE *); +void raw_args(char *argv[]); +void raw_cat(int); int main(argc, argv) diff --git a/bin/chio/chio.c b/bin/chio/chio.c index a11ff0c2792..deee9b68a79 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chio.c,v 1.9 2001/03/21 22:23:58 art Exp $ */ +/* $OpenBSD: chio.c,v 1.10 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: chio.c,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $ */ /* @@ -50,21 +50,21 @@ extern char *__progname; /* from crt0.o */ -static void usage __P((void)); -static void cleanup __P((void)); -static int parse_element_type __P((char *)); -static int parse_element_unit __P((char *)); -static int parse_special __P((char *)); -static int is_special __P((char *)); -static char *bits_to_string __P((int, const char *)); - -static int do_move __P((char *, int, char **)); -static int do_exchange __P((char *, int, char **)); -static int do_position __P((char *, int, char **)); -static int do_params __P((char *, int, char **)); -static int do_getpicker __P((char *, int, char **)); -static int do_setpicker __P((char *, int, char **)); -static int do_status __P((char *, int, char **)); +static void usage(void); +static void cleanup(void); +static int parse_element_type(char *); +static int parse_element_unit(char *); +static int parse_special(char *); +static int is_special(char *); +static char *bits_to_string(int, const char *); + +static int do_move(char *, int, char **); +static int do_exchange(char *, int, char **); +static int do_position(char *, int, char **); +static int do_params(char *, int, char **); +static int do_getpicker(char *, int, char **); +static int do_setpicker(char *, int, char **); +static int do_status(char *, int, char **); /* Valid changer element types. */ const struct element_type elements[] = { diff --git a/bin/chio/defs.h b/bin/chio/defs.h index 58ffd330c7a..486985723c1 100644 --- a/bin/chio/defs.h +++ b/bin/chio/defs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: defs.h,v 1.3 1997/11/08 23:22:41 todd Exp $ */ +/* $OpenBSD: defs.h,v 1.4 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: defs.h,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $ */ /* @@ -41,7 +41,7 @@ struct element_type { struct changer_command { char *cc_name; /* command name */ /* command handler */ - int (*cc_handler) __P((char *, int, char **)); + int (*cc_handler)(char *, int, char **); }; struct special_word { diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c index 8cc04abcde0..b449a0d803c 100644 --- a/bin/chmod/chmod.c +++ b/bin/chmod/chmod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chmod.c,v 1.12 2000/07/31 19:02:38 ericj Exp $ */ +/* $OpenBSD: chmod.c,v 1.13 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: chmod.c,v 1.12 1995/03/21 09:02:09 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94"; #else -static char rcsid[] = "$OpenBSD: chmod.c,v 1.12 2000/07/31 19:02:38 ericj Exp $"; +static char rcsid[] = "$OpenBSD: chmod.c,v 1.13 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -66,9 +66,9 @@ static char rcsid[] = "$OpenBSD: chmod.c,v 1.12 2000/07/31 19:02:38 ericj Exp $" int ischflags, ischown, ischgrp, ischmod; extern char *__progname; -gid_t a_gid __P((const char *)); -uid_t a_uid __P((const char *)); -void usage __P((void)); +gid_t a_gid(const char *); +uid_t a_uid(const char *); +void usage(void); int main(argc, argv) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index b0e694cc129..43d4f15b8c0 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cp.c,v 1.17 2001/06/25 04:35:31 art Exp $ */ +/* $OpenBSD: cp.c,v 1.18 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95"; #else -static char rcsid[] = "$OpenBSD: cp.c,v 1.17 2001/06/25 04:35:31 art Exp $"; +static char rcsid[] = "$OpenBSD: cp.c,v 1.18 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -97,9 +97,9 @@ int myumask; enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE }; -int copy __P((char *[], enum op, int)); -int mastercmp __P((const FTSENT **, const FTSENT **)); -char *find_last_component __P((char *)); +int copy(char *[], enum op, int); +int mastercmp(const FTSENT **, const FTSENT **); +char *find_last_component(char *); int main(argc, argv) diff --git a/bin/cp/extern.h b/bin/cp/extern.h index 4c410aca776..ce9b22753f5 100644 --- a/bin/cp/extern.h +++ b/bin/cp/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.8 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: extern.h,v 1.9 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1995/03/21 09:02:16 cgd Exp $ */ /*- @@ -50,11 +50,11 @@ extern char *__progname; #include <sys/cdefs.h> __BEGIN_DECLS -int copy_fifo __P((struct stat *, int)); -int copy_file __P((FTSENT *, int)); -int copy_link __P((FTSENT *, int)); -int copy_special __P((struct stat *, int)); -int setfile __P((struct stat *, int)); -int setlink __P((struct stat *)); -void usage __P((void)); +int copy_fifo(struct stat *, int); +int copy_file(FTSENT *, int); +int copy_link(FTSENT *, int); +int copy_special(struct stat *, int); +int setfile(struct stat *, int); +int setlink(struct stat *); +void usage(void); __END_DECLS diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 309ca119c84..eecb80ab37b 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.c,v 1.14 2001/06/22 21:07:35 deraadt Exp $ */ +/* $OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93"; #else -static char rcsid[] = "$OpenBSD: csh.c,v 1.14 2001/06/22 21:07:35 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -104,16 +104,16 @@ bool tellwhat = 0; extern char **environ; -static int readf __P((void *, char *, int)); -static fpos_t seekf __P((void *, fpos_t, int)); -static int writef __P((void *, const char *, int)); -static int closef __P((void *)); -static int srccat __P((Char *, Char *)); -static int srcfile __P((char *, bool, bool)); -static void phup __P((int)); -static void srcunit __P((int, bool, bool)); -static void mailchk __P((void)); -static Char **defaultpath __P((void)); +static int readf(void *, char *, int); +static fpos_t seekf(void *, fpos_t, int); +static int writef(void *, const char *, int); +static int closef(void *); +static int srccat(Char *, Char *); +static int srcfile(char *, bool, bool); +static void phup(int); +static void srcunit(int, bool, bool); +static void mailchk(void); +static Char **defaultpath(void); int main(argc, argv) diff --git a/bin/csh/csh.h b/bin/csh/csh.h index fcb4e8b92cd..a7029b2ef38 100644 --- a/bin/csh/csh.h +++ b/bin/csh/csh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.h,v 1.7 2000/10/30 17:16:46 millert Exp $ */ +/* $OpenBSD: csh.h,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $ */ /*- @@ -360,7 +360,7 @@ struct command { extern struct biltins { char *bname; - void (*bfunct) __P((Char **, struct command *)); + void (*bfunct)(Char **, struct command *); short minargs, maxargs; } bfunc[]; extern int nbfunc; diff --git a/bin/csh/dir.c b/bin/csh/dir.c index 6143fbc552f..342f8cffcde 100644 --- a/bin/csh/dir.c +++ b/bin/csh/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.4 1998/05/18 20:37:19 deraadt Exp $ */ +/* $OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dir.c,v 1.4 1998/05/18 20:37:19 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -61,12 +61,12 @@ static char rcsid[] = "$OpenBSD: dir.c,v 1.4 1998/05/18 20:37:19 deraadt Exp $"; /* Directory management. */ static struct directory - *dfind __P((Char *)); -static Char *dfollow __P((Char *)); -static void printdirs __P((void)); -static Char *dgoto __P((Char *)); -static void dnewcwd __P((struct directory *)); -static void dset __P((Char *)); + *dfind(Char *); +static Char *dfollow(Char *); +static void printdirs(void); +static Char *dgoto(Char *); +static void dnewcwd(struct directory *); +static void dset(Char *); struct directory dhead; /* "head" of loop */ int printd; /* force name to be printed */ diff --git a/bin/csh/dol.c b/bin/csh/dol.c index fd6ce9b1f53..a3432c4b291 100644 --- a/bin/csh/dol.c +++ b/bin/csh/dol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dol.c,v 1.7 2002/02/01 02:15:01 itojun Exp $ */ +/* $OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dol.c,v 1.7 2002/02/01 02:15:01 itojun Exp $"; +static char rcsid[] = "$OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -91,17 +91,17 @@ static int dolnmod; /* Number of modifiers */ static int dolmcnt; /* :gx -> 10000, else 1 */ static int dolwcnt; /* :wx -> 10000, else 1 */ -static void Dfix2 __P((Char **)); -static Char *Dpack __P((Char *, Char *)); -static int Dword __P((void)); -static void dolerror __P((Char *)); -static int DgetC __P((int)); -static void Dgetdol __P((void)); -static void fixDolMod __P((void)); -static void setDolp __P((Char *)); -static void unDredc __P((int)); -static int Dredc __P((void)); -static void Dtestq __P((int)); +static void Dfix2(Char **); +static Char *Dpack(Char *, Char *); +static int Dword(void); +static void dolerror(Char *); +static int DgetC(int); +static void Dgetdol(void); +static void fixDolMod(void); +static void setDolp(Char *); +static void unDredc(int); +static int Dredc(void); +static void Dtestq(int); /* diff --git a/bin/csh/exec.c b/bin/csh/exec.c index c42dac6e1d8..59d8c05021a 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.7 1998/05/18 20:38:19 deraadt Exp $ */ +/* $OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95"; #else -static char rcsid[] = "$OpenBSD: exec.c,v 1.7 1998/05/18 20:38:19 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -104,12 +104,12 @@ static int hits, misses; /* Dummy search path for just absolute search when no path */ static Char *justabs[] = {STRNULL, 0}; -static void pexerr __P((void)); -static void texec __P((Char *, Char **)); -static int hashname __P((Char *)); -static int tellmewhat __P((struct wordent *, Char *)); -static int executable __P((Char *, Char *, bool)); -static int iscommand __P((Char *)); +static void pexerr(void); +static void texec(Char *, Char **); +static int hashname(Char *); +static int tellmewhat(struct wordent *, Char *); +static int executable(Char *, Char *, bool); +static int iscommand(Char *); void diff --git a/bin/csh/exp.c b/bin/csh/exp.c index f832d0111b8..862485423f0 100644 --- a/bin/csh/exp.c +++ b/bin/csh/exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey Exp $ */ +/* $OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey Exp $"; +static char rcsid[] = "$OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -75,23 +75,23 @@ static char rcsid[] = "$OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey Exp $"; #define EQMATCH 7 #define NOTEQMATCH 8 -static int exp1 __P((Char ***, bool)); -static int exp2 __P((Char ***, bool)); -static int exp2a __P((Char ***, bool)); -static int exp2b __P((Char ***, bool)); -static int exp2c __P((Char ***, bool)); -static Char * exp3 __P((Char ***, bool)); -static Char * exp3a __P((Char ***, bool)); -static Char * exp4 __P((Char ***, bool)); -static Char * exp5 __P((Char ***, bool)); -static Char * exp6 __P((Char ***, bool)); -static void evalav __P((Char **)); -static int isa __P((Char *, int)); -static int egetn __P((Char *)); +static int exp1(Char ***, bool); +static int exp2(Char ***, bool); +static int exp2a(Char ***, bool); +static int exp2b(Char ***, bool); +static int exp2c(Char ***, bool); +static Char * exp3(Char ***, bool); +static Char * exp3a(Char ***, bool); +static Char * exp4(Char ***, bool); +static Char * exp5(Char ***, bool); +static Char * exp6(Char ***, bool); +static void evalav(Char **); +static int isa(Char *, int); +static int egetn(Char *); #ifdef EDEBUG -static void etracc __P((char *, Char *, Char ***)); -static void etraci __P((char *, int, Char ***)); +static void etracc(char *, Char *, Char ***); +static void etraci(char *, int, Char ***); #endif int diff --git a/bin/csh/extern.h b/bin/csh/extern.h index 26e697cfa70..393be67a3a8 100644 --- a/bin/csh/extern.h +++ b/bin/csh/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 1996/11/02 01:00:32 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $ */ /*- @@ -41,300 +41,300 @@ /* * csh.c */ -int gethdir __P((Char *)); -void dosource __P((Char **, struct command *)); -void exitstat __P((void)); -void goodbye __P((void)); -void importpath __P((Char *)); -void initdesc __P((void)); -void pintr __P((int)); -void pintr1 __P((bool)); -void printprompt __P((void)); -void process __P((bool)); -void rechist __P((void)); -void untty __P((void)); -int vis_fputc __P((int, FILE *)); +int gethdir(Char *); +void dosource(Char **, struct command *); +void exitstat(void); +void goodbye(void); +void importpath(Char *); +void initdesc(void); +void pintr(int); +void pintr1(bool); +void printprompt(void); +void process(bool); +void rechist(void); +void untty(void); +int vis_fputc(int, FILE *); #ifdef PROF -void done __P((int)); +void done(int); #else -void xexit __P((int)); +void xexit(int); #endif /* * dir.c */ -void dinit __P((Char *)); -void dodirs __P((Char **, struct command *)); -Char *dcanon __P((Char *, Char *)); -void dtildepr __P((Char *, Char *)); -void dtilde __P((void)); -void dochngd __P((Char **, struct command *)); -Char *dnormalize __P((Char *)); -void dopushd __P((Char **, struct command *)); -void dopopd __P((Char **, struct command *)); +void dinit(Char *); +void dodirs(Char **, struct command *); +Char *dcanon(Char *, Char *); +void dtildepr(Char *, Char *); +void dtilde(void); +void dochngd(Char **, struct command *); +Char *dnormalize(Char *); +void dopushd(Char **, struct command *); +void dopopd(Char **, struct command *); struct directory; -void dfree __P((struct directory *)); +void dfree(struct directory *); /* * dol.c */ -void Dfix __P((struct command *)); -Char *Dfix1 __P((Char *)); -void heredoc __P((Char *)); +void Dfix(struct command *); +Char *Dfix1(Char *); +void heredoc(Char *); /* * err.c */ -void seterror __P((int, ...)); -void stderror __P((int, ...)); +void seterror(int, ...); +void stderror(int, ...); /* * exec.c */ -void doexec __P((Char **, struct command *)); -void dohash __P((Char **, struct command *)); -void dounhash __P((Char **, struct command *)); -void dowhich __P((Char **, struct command *)); -void execash __P((Char **, struct command *)); -void hashstat __P((Char **, struct command *)); -void xechoit __P((Char **)); +void doexec(Char **, struct command *); +void dohash(Char **, struct command *); +void dounhash(Char **, struct command *); +void dowhich(Char **, struct command *); +void execash(Char **, struct command *); +void hashstat(Char **, struct command *); +void xechoit(Char **); /* * exp.c */ -int expr __P((Char ***)); -int exp0 __P((Char ***, bool)); +int expr(Char ***); +int exp0(Char ***, bool); /* * file.c */ #ifdef FILEC -int tenex __P((Char *, int)); +int tenex(Char *, int); #endif /* * func.c */ -void Setenv __P((Char *, Char *)); -void doalias __P((Char **, struct command *)); -void dobreak __P((Char **, struct command *)); -void docontin __P((Char **, struct command *)); -void doecho __P((Char **, struct command *)); -void doelse __P((Char **, struct command *)); -void doend __P((Char **, struct command *)); -void doeval __P((Char **, struct command *)); -void doexit __P((Char **, struct command *)); -void doforeach __P((Char **, struct command *)); -void doglob __P((Char **, struct command *)); -void dogoto __P((Char **, struct command *)); -void doif __P((Char **, struct command *)); -void dolimit __P((Char **, struct command *)); -void dologin __P((Char **, struct command *)); -void dologout __P((Char **, struct command *)); -void donohup __P((Char **, struct command *)); -void doonintr __P((Char **, struct command *)); -void doprintf __P((Char **, struct command *)); -void dorepeat __P((Char **, struct command *)); -void dosetenv __P((Char **, struct command *)); -void dosuspend __P((Char **, struct command *)); -void doswbrk __P((Char **, struct command *)); -void doswitch __P((Char **, struct command *)); -void doumask __P((Char **, struct command *)); -void dounlimit __P((Char **, struct command *)); -void dounsetenv __P((Char **, struct command *)); -void dowhile __P((Char **, struct command *)); -void dozip __P((Char **, struct command *)); -void func __P((struct command *, struct biltins *)); +void Setenv(Char *, Char *); +void doalias(Char **, struct command *); +void dobreak(Char **, struct command *); +void docontin(Char **, struct command *); +void doecho(Char **, struct command *); +void doelse(Char **, struct command *); +void doend(Char **, struct command *); +void doeval(Char **, struct command *); +void doexit(Char **, struct command *); +void doforeach(Char **, struct command *); +void doglob(Char **, struct command *); +void dogoto(Char **, struct command *); +void doif(Char **, struct command *); +void dolimit(Char **, struct command *); +void dologin(Char **, struct command *); +void dologout(Char **, struct command *); +void donohup(Char **, struct command *); +void doonintr(Char **, struct command *); +void doprintf(Char **, struct command *); +void dorepeat(Char **, struct command *); +void dosetenv(Char **, struct command *); +void dosuspend(Char **, struct command *); +void doswbrk(Char **, struct command *); +void doswitch(Char **, struct command *); +void doumask(Char **, struct command *); +void dounlimit(Char **, struct command *); +void dounsetenv(Char **, struct command *); +void dowhile(Char **, struct command *); +void dozip(Char **, struct command *); +void func(struct command *, struct biltins *); struct biltins * - isbfunc __P((struct command *)); -void prvars __P((void)); -void gotolab __P((Char *)); -int srchx __P((Char *)); -void unalias __P((Char **, struct command *)); -void wfree __P((void)); + isbfunc(struct command *); +void prvars(void); +void gotolab(Char *); +int srchx(Char *); +void unalias(Char **, struct command *); +void wfree(void); /* * glob.c */ -Char **dobackp __P((Char *, bool)); -void Gcat __P((Char *, Char *)); -Char *globone __P((Char *, int)); -int Gmatch __P((Char *, Char *)); -void ginit __P((void)); -Char **globall __P((Char **)); +Char **dobackp(Char *, bool); +void Gcat(Char *, Char *); +Char *globone(Char *, int); +int Gmatch(Char *, Char *); +void ginit(void); +Char **globall(Char **); void rscan __P((Char **, void (*)())); -void tglob __P((Char **)); -void trim __P((Char **)); +void tglob(Char **); +void trim(Char **); #ifdef FILEC -int sortscmp __P((const ptr_t, const ptr_t)); +int sortscmp(const ptr_t, const ptr_t); #endif /* FILEC */ /* * hist.c */ -void dohist __P((Char **, struct command *)); +void dohist(Char **, struct command *); struct Hist * - enthist __P((int, struct wordent *, bool)); -void savehist __P((struct wordent *)); + enthist(int, struct wordent *, bool); +void savehist(struct wordent *); /* * lex.c */ -void addla __P((Char *)); -void bseek __P((struct Ain *)); -void btell __P((struct Ain *)); -void btoeof __P((void)); -void copylex __P((struct wordent *, struct wordent *)); -Char *domod __P((Char *, int)); -void freelex __P((struct wordent *)); -int lex __P((struct wordent *)); -void prlex __P((FILE *, struct wordent *)); -int readc __P((bool)); -void settell __P((void)); -void unreadc __P((int)); +void addla(Char *); +void bseek(struct Ain *); +void btell(struct Ain *); +void btoeof(void); +void copylex(struct wordent *, struct wordent *); +Char *domod(Char *, int); +void freelex(struct wordent *); +int lex(struct wordent *); +void prlex(FILE *, struct wordent *); +int readc(bool); +void settell(void); +void unreadc(int); /* * misc.c */ -int any __P((char *, int)); -Char **blkcat __P((Char **, Char **)); -Char **blkcpy __P((Char **, Char **)); -Char **blkend __P((Char **)); -void blkfree __P((Char **)); -int blklen __P((Char **)); -void blkpr __P((FILE *, Char **)); -Char **blkspl __P((Char **, Char **)); -void closem __P((void)); -Char **copyblk __P((Char **)); -int dcopy __P((int, int)); -int dmove __P((int, int)); -void donefds __P((void)); -Char lastchr __P((Char *)); -void lshift __P((Char **, int)); -int number __P((Char *)); -int prefix __P((Char *, Char *)); -Char **saveblk __P((Char **)); -void setzero __P((char *, int)); -Char *strip __P((Char *)); -Char *quote __P((Char *)); -char *strsave __P((char *)); -char *strspl __P((char *, char *)); -void udvar __P((Char *)); +int any(char *, int); +Char **blkcat(Char **, Char **); +Char **blkcpy(Char **, Char **); +Char **blkend(Char **); +void blkfree(Char **); +int blklen(Char **); +void blkpr(FILE *, Char **); +Char **blkspl(Char **, Char **); +void closem(void); +Char **copyblk(Char **); +int dcopy(int, int); +int dmove(int, int); +void donefds(void); +Char lastchr(Char *); +void lshift(Char **, int); +int number(Char *); +int prefix(Char *, Char *); +Char **saveblk(Char **); +void setzero(char *, int); +Char *strip(Char *); +Char *quote(Char *); +char *strsave(char *); +char *strspl(char *, char *); +void udvar(Char *); #ifndef SHORT_STRINGS # ifdef NOTUSED -char *strstr __P((const char *, const char *)); +char *strstr(const char *, const char *); # endif /* NOTUSED */ -char *strend __P((char *)); +char *strend(char *); #endif /* * parse.c */ -void alias __P((struct wordent *)); -void freesyn __P((struct command *)); +void alias(struct wordent *); +void freesyn(struct command *); struct command * - syntax __P((struct wordent *, struct wordent *, int)); + syntax(struct wordent *, struct wordent *, int); /* * proc.c */ -void dobg __P((Char **, struct command *)); -void dobg1 __P((Char **, struct command *)); -void dofg __P((Char **, struct command *)); -void dofg1 __P((Char **, struct command *)); -void dojobs __P((Char **, struct command *)); -void dokill __P((Char **, struct command *)); -void donotify __P((Char **, struct command *)); -void dostop __P((Char **, struct command *)); -void dowait __P((Char **, struct command *)); -void palloc __P((int, struct command *)); -void panystop __P((bool)); -void pchild __P((int)); -void pendjob __P((void)); +void dobg(Char **, struct command *); +void dobg1(Char **, struct command *); +void dofg(Char **, struct command *); +void dofg1(Char **, struct command *); +void dojobs(Char **, struct command *); +void dokill(Char **, struct command *); +void donotify(Char **, struct command *); +void dostop(Char **, struct command *); +void dowait(Char **, struct command *); +void palloc(int, struct command *); +void panystop(bool); +void pchild(int); +void pendjob(void); struct process * - pfind __P((Char *)); -int pfork __P((struct command *, int)); -void pgetty __P((int, int)); -void pjwait __P((struct process *)); -void pnote __P((void)); -void prestjob __P((void)); -void psavejob __P((void)); -void pstart __P((struct process *, int)); -void pwait __P((void)); + pfind(Char *); +int pfork(struct command *, int); +void pgetty(int, int); +void pjwait(struct process *); +void pnote(void); +void prestjob(void); +void psavejob(void); +void pstart(struct process *, int); +void pwait(void); /* * sem.c */ -void execute __P((struct command *, int, int *, int *)); -void mypipe __P((int *)); +void execute(struct command *, int, int *, int *); +void mypipe(int *); /* * set.c */ struct varent - *adrof1 __P((Char *, struct varent *)); -void doset __P((Char **, struct command *)); -void dolet __P((Char **, struct command *)); -Char *putn __P((int)); -int getn __P((Char *)); -Char *value1 __P((Char *, struct varent *)); -void set __P((Char *, Char *)); -void set1 __P((Char *, Char **, struct varent *)); -void setq __P((Char *, Char **, struct varent *)); -void unset __P((Char **, struct command *)); -void unset1 __P((Char *[], struct varent *)); -void unsetv __P((Char *)); -void setNS __P((Char *)); -void shift __P((Char **, struct command *)); -void plist __P((struct varent *)); + *adrof1(Char *, struct varent *); +void doset(Char **, struct command *); +void dolet(Char **, struct command *); +Char *putn(int); +int getn(Char *); +Char *value1(Char *, struct varent *); +void set(Char *, Char *); +void set1(Char *, Char **, struct varent *); +void setq(Char *, Char **, struct varent *); +void unset(Char **, struct command *); +void unset1(Char *[], struct varent *); +void unsetv(Char *); +void setNS(Char *); +void shift(Char **, struct command *); +void plist(struct varent *); /* * time.c */ -void donice __P((Char **, struct command *)); -void dotime __P((Char **, struct command *)); +void donice(Char **, struct command *); +void dotime(Char **, struct command *); void prusage __P((struct rusage *, struct rusage *, struct timeval *, struct timeval *)); -void ruadd __P((struct rusage *, struct rusage *)); -void settimes __P((void)); -void pcsecs __P((long)); -void psecs __P((long)); +void ruadd(struct rusage *, struct rusage *); +void settimes(void); +void pcsecs(long); +void psecs(long); /* * alloc.c */ -void Free __P((ptr_t)); -ptr_t Malloc __P((size_t)); -ptr_t Realloc __P((ptr_t, size_t)); -ptr_t Calloc __P((size_t, size_t)); -void showall __P((Char **, struct command *)); +void Free(ptr_t); +ptr_t Malloc(size_t); +ptr_t Realloc(ptr_t, size_t); +ptr_t Calloc(size_t, size_t); +void showall(Char **, struct command *); /* * str.c: */ #ifdef SHORT_STRINGS -Char *s_strchr __P((Char *, int)); -Char *s_strrchr __P((Char *, int)); -Char *s_strcat __P((Char *, Char *)); +Char *s_strchr(Char *, int); +Char *s_strrchr(Char *, int); +Char *s_strcat(Char *, Char *); #ifdef NOTUSED -Char *s_strncat __P((Char *, Char *, size_t)); +Char *s_strncat(Char *, Char *, size_t); #endif -Char *s_strcpy __P((Char *, Char *)); -Char *s_strncpy __P((Char *, Char *, size_t)); -Char *s_strspl __P((Char *, Char *)); -size_t s_strlen __P((Char *)); -int s_strcmp __P((Char *, Char *)); -int s_strncmp __P((Char *, Char *, size_t)); -Char *s_strsave __P((Char *)); -Char *s_strend __P((Char *)); -Char *s_strstr __P((Char *, Char *)); -Char *str2short __P((char *)); -Char **blk2short __P((char **)); -char *short2str __P((Char *)); -char **short2blk __P((Char **)); +Char *s_strcpy(Char *, Char *); +Char *s_strncpy(Char *, Char *, size_t); +Char *s_strspl(Char *, Char *); +size_t s_strlen(Char *); +int s_strcmp(Char *, Char *); +int s_strncmp(Char *, Char *, size_t); +Char *s_strsave(Char *); +Char *s_strend(Char *); +Char *s_strstr(Char *, Char *); +Char *str2short(char *); +Char **blk2short(char **); +char *short2str(Char *); +char **short2blk(Char **); #endif -char *short2qstr __P((Char *)); -char *vis_str __P((Char *)); +char *short2qstr(Char *); +char *vis_str(Char *); diff --git a/bin/csh/file.c b/bin/csh/file.c index a4319857ef0..5f4c46545cf 100644 --- a/bin/csh/file.c +++ b/bin/csh/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.7 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: file.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: file.c,v 1.7 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: file.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -86,25 +86,25 @@ typedef enum { LIST, RECOGNIZE } COMMAND; -static void setup_tty __P((int)); -static void back_to_col_1 __P((void)); -static void pushback __P((Char *)); -static void catn __P((Char *, Char *, int)); -static void copyn __P((Char *, Char *, int)); -static Char filetype __P((Char *, Char *)); -static void print_by_column __P((Char *, Char *[], int)); -static Char *tilde __P((Char *, Char *)); -static void retype __P((void)); -static void beep __P((void)); -static void print_recognized_stuff __P((Char *)); -static void extract_dir_and_name __P((Char *, Char *, Char *)); -static Char *getentry __P((DIR *, int)); -static void free_items __P((Char **)); -static int tsearch __P((Char *, COMMAND, int)); -static int recognize __P((Char *, Char *, int, int)); -static int is_prefix __P((Char *, Char *)); -static int is_suffix __P((Char *, Char *)); -static int ignored __P((Char *)); +static void setup_tty(int); +static void back_to_col_1(void); +static void pushback(Char *); +static void catn(Char *, Char *, int); +static void copyn(Char *, Char *, int); +static Char filetype(Char *, Char *); +static void print_by_column(Char *, Char *[], int); +static Char *tilde(Char *, Char *); +static void retype(void); +static void beep(void); +static void print_recognized_stuff(Char *); +static void extract_dir_and_name(Char *, Char *, Char *); +static Char *getentry(DIR *, int); +static void free_items(Char **); +static int tsearch(Char *, COMMAND, int); +static int recognize(Char *, Char *, int, int); +static int is_prefix(Char *, Char *); +static int is_suffix(Char *, Char *); +static int ignored(Char *); /* * Put this here so the binary can be patched with adb to enable file @@ -533,7 +533,7 @@ again: /* search for matches */ } else { /* LIST */ qsort((ptr_t) items, numitems, sizeof(items[0]), - (int (*) __P((const void *, const void *))) sortscmp); + (int (*)(const void *, const void *)) sortscmp); print_by_column(looking_for_lognames ? NULL : tilded_dir, items, numitems); if (items != NULL) diff --git a/bin/csh/func.c b/bin/csh/func.c index 38617cd6f95..c64f90da9bc 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -1,4 +1,4 @@ -/* $OpenBSD: func.c,v 1.12 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: func.c,v 1.13 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: func.c,v 1.12 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: func.c,v 1.13 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -62,16 +62,16 @@ static char rcsid[] = "$OpenBSD: func.c,v 1.12 2001/12/01 19:10:39 deraadt Exp $ extern char **environ; static int zlast = -1; -static void islogin __P((void)); -static void reexecute __P((struct command *)); -static void preread __P((void)); -static void doagain __P((void)); -static void search __P((int, int, Char *)); -static int getword __P((Char *)); -static int keyword __P((Char *)); -static void toend __P((void)); -static void xecho __P((int, Char **)); -static void Unsetenv __P((Char *)); +static void islogin(void); +static void reexecute(struct command *); +static void preread(void); +static void doagain(void); +static void search(int, int, Char *); +static int getword(Char *); +static int keyword(Char *); +static void toend(void); +static void xecho(int, Char **); +static void Unsetenv(Char *); struct biltins * isbfunc(t) @@ -1163,11 +1163,11 @@ static struct limits { { -1, NULL, 0, NULL } }; -static struct limits *findlim __P((Char *)); -static RLIM_TYPE getval __P((struct limits *, Char **)); -static void limtail __P((Char *, char *)); -static void plim __P((struct limits *, Char)); -static int setlim __P((struct limits *, Char, RLIM_TYPE)); +static struct limits *findlim(Char *); +static RLIM_TYPE getval(struct limits *, Char **); +static void limtail(Char *, char *); +static void plim(struct limits *, Char); +static int setlim(struct limits *, Char, RLIM_TYPE); static struct limits * findlim(cp) @@ -1515,7 +1515,7 @@ doprintf(v, t) { Char **newv; char **c; - extern int progprintf __P((int, char **)); + extern int progprintf(int, char **); int ret; gflag = 0; diff --git a/bin/csh/glob.c b/bin/csh/glob.c index ce729463bc4..cd3e1175002 100644 --- a/bin/csh/glob.c +++ b/bin/csh/glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.c,v 1.5 1997/09/01 18:40:50 millert Exp $ */ +/* $OpenBSD: glob.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: glob.c,v 1.5 1997/09/01 18:40:50 millert Exp $"; +static char rcsid[] = "$OpenBSD: glob.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -89,15 +89,15 @@ long pargc = 0; * handled in glob() which is part of the 4.4BSD libc. * */ -static Char *globtilde __P((Char **, Char *)); -static Char **libglob __P((Char **)); -static Char **globexpand __P((Char **)); -static int globbrace __P((Char *, Char *, Char ***)); -static void expbrace __P((Char ***, Char ***, int)); -static int pmatch __P((Char *, Char *)); -static void pword __P((void)); -static void psave __P((int)); -static void backeval __P((Char *, bool)); +static Char *globtilde(Char **, Char *); +static Char **libglob(Char **); +static Char **globexpand(Char **); +static int globbrace(Char *, Char *, Char ***); +static void expbrace(Char ***, Char ***, int); +static int pmatch(Char *, Char *); +static void pword(void); +static void psave(int); +static void backeval(Char *, bool); static Char * diff --git a/bin/csh/hist.c b/bin/csh/hist.c index 073e5277fad..a4dfa650281 100644 --- a/bin/csh/hist.c +++ b/bin/csh/hist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hist.c,v 1.3 1997/07/25 18:58:09 mickey Exp $ */ +/* $OpenBSD: hist.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: hist.c,v 1.7 1995/03/21 18:35:44 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: hist.c,v 1.3 1997/07/25 18:58:09 mickey Exp $"; +static char rcsid[] = "$OpenBSD: hist.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -53,9 +53,9 @@ static char rcsid[] = "$OpenBSD: hist.c,v 1.3 1997/07/25 18:58:09 mickey Exp $"; #include "csh.h" #include "extern.h" -static void hfree __P((struct Hist *)); -static void dohist1 __P((struct Hist *, int *, int, int)); -static void phist __P((struct Hist *, int)); +static void hfree(struct Hist *); +static void dohist1(struct Hist *, int *, int, int); +static void phist(struct Hist *, int); void savehist(sp) diff --git a/bin/csh/lex.c b/bin/csh/lex.c index 267dab2e126..0c43487682c 100644 --- a/bin/csh/lex.c +++ b/bin/csh/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.4 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: lex.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: lex.c,v 1.4 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: lex.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -64,24 +64,24 @@ static char rcsid[] = "$OpenBSD: lex.c,v 1.4 2001/12/01 19:10:39 deraadt Exp $"; * of input buffering, and especially because of history substitution. */ -static Char *word __P((void)); -static int getC1 __P((int)); -static void getdol __P((void)); -static void getexcl __P((int)); +static Char *word(void); +static int getC1(int); +static void getdol(void); +static void getexcl(int); static struct Hist - *findev __P((Char *, bool)); -static void setexclp __P((Char *)); -static int bgetc __P((void)); -static void bfree __P((void)); + *findev(Char *, bool); +static void setexclp(Char *); +static int bgetc(void); +static void bfree(void); static struct wordent - *gethent __P((int)); -static int matchs __P((Char *, Char *)); -static int getsel __P((int *, int *, int)); + *gethent(int); +static int matchs(Char *, Char *); +static int getsel(int *, int *, int); static struct wordent - *getsub __P((struct wordent *)); -static Char *subword __P((Char *, int, bool *)); + *getsub(struct wordent *); +static Char *subword(Char *, int, bool *); static struct wordent - *dosub __P((int, struct wordent *, bool)); + *dosub(int, struct wordent *, bool); /* * Peekc is a peek character for getC, peekread for readc. diff --git a/bin/csh/misc.c b/bin/csh/misc.c index 815d3c63e59..946680f7494 100644 --- a/bin/csh/misc.c +++ b/bin/csh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.5 1997/07/25 18:58:13 mickey Exp $ */ +/* $OpenBSD: misc.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.5 1997/07/25 18:58:13 mickey Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: misc.c,v 1.5 1997/07/25 18:58:13 mickey Exp $"; #include "csh.h" #include "extern.h" -static int renum __P((int, int)); +static int renum(int, int); int any(s, c) diff --git a/bin/csh/parse.c b/bin/csh/parse.c index 9b039456e73..ba347b595bf 100644 --- a/bin/csh/parse.c +++ b/bin/csh/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.3 1997/07/25 18:58:14 mickey Exp $ */ +/* $OpenBSD: parse.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: parse.c,v 1.6 1995/03/21 09:03:10 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: parse.c,v 1.3 1997/07/25 18:58:14 mickey Exp $"; +static char rcsid[] = "$OpenBSD: parse.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -54,23 +54,23 @@ static char rcsid[] = "$OpenBSD: parse.c,v 1.3 1997/07/25 18:58:14 mickey Exp $" #include "csh.h" #include "extern.h" -static void asyntax __P((struct wordent *, struct wordent *)); -static void asyn0 __P((struct wordent *, struct wordent *)); -static void asyn3 __P((struct wordent *, struct wordent *)); +static void asyntax(struct wordent *, struct wordent *); +static void asyn0(struct wordent *, struct wordent *); +static void asyn3(struct wordent *, struct wordent *); static struct wordent - *freenod __P((struct wordent *, struct wordent *)); + *freenod(struct wordent *, struct wordent *); static struct command - *syn0 __P((struct wordent *, struct wordent *, int)); + *syn0(struct wordent *, struct wordent *, int); static struct command - *syn1 __P((struct wordent *, struct wordent *, int)); + *syn1(struct wordent *, struct wordent *, int); static struct command - *syn1a __P((struct wordent *, struct wordent *, int)); + *syn1a(struct wordent *, struct wordent *, int); static struct command - *syn1b __P((struct wordent *, struct wordent *, int)); + *syn1b(struct wordent *, struct wordent *, int); static struct command - *syn2 __P((struct wordent *, struct wordent *, int)); + *syn2(struct wordent *, struct wordent *, int); static struct command - *syn3 __P((struct wordent *, struct wordent *, int)); + *syn3(struct wordent *, struct wordent *, int); #define ALEFT 21 /* max of 20 alias expansions */ #define HLEFT 11 /* max of 10 history expansions */ diff --git a/bin/csh/printf.c b/bin/csh/printf.c index d680ff19287..039124e05ac 100644 --- a/bin/csh/printf.c +++ b/bin/csh/printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printf.c,v 1.10 2000/12/22 22:53:10 deraadt Exp $ */ +/* $OpenBSD: printf.c,v 1.11 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: printf.c,v 1.6 1995/03/21 09:03:15 cgd Exp $ */ /* @@ -46,7 +46,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)printf.c 8.1 (Berkeley) 7/20/93"; #else -static char rcsid[] = "$OpenBSD: printf.c,v 1.10 2000/12/22 22:53:10 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: printf.c,v 1.11 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -72,15 +72,15 @@ static char rcsid[] = "$OpenBSD: printf.c,v 1.10 2000/12/22 22:53:10 deraadt Exp (void)printf(f, func); \ } -static int asciicode __P((void)); -static void escape __P((char *)); -static int getchr __P((void)); -static double getdouble __P((void)); -static int getint __P((int *)); -static int getlong __P((long *)); -static char *getstr __P((void)); -static char *mklong __P((char *, int)); -static void usage __P((void)); +static int asciicode(void); +static void escape(char *); +static int getchr(void); +static double getdouble(void); +static int getint(int *); +static int getlong(long *); +static char *getstr(void); +static char *mklong(char *, int); +static void usage(void); static char **gargv; diff --git a/bin/csh/proc.c b/bin/csh/proc.c index e7b0bd57fc2..2d1a4b2dece 100644 --- a/bin/csh/proc.c +++ b/bin/csh/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.13 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: proc.c,v 1.14 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: proc.c,v 1.13 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: proc.c,v 1.14 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -63,17 +63,17 @@ static char rcsid[] = "$OpenBSD: proc.c,v 1.13 2001/12/01 19:10:39 deraadt Exp $ static struct rusage zru; -static void pflushall __P((void)); -static void pflush __P((struct process *)); -static void pclrcurr __P((struct process *)); -static void padd __P((struct command *)); -static int pprint __P((struct process *, int)); -static void ptprint __P((struct process *)); -static void pads __P((Char *)); -static void pkill __P((Char **v, int)); +static void pflushall(void); +static void pflush(struct process *); +static void pclrcurr(struct process *); +static void padd(struct command *); +static int pprint(struct process *, int); +static void ptprint(struct process *); +static void pads(Char *); +static void pkill(Char **v, int); static struct process - *pgetcurr __P((struct process *)); -static void okpcntl __P((void)); + *pgetcurr(struct process *); +static void okpcntl(void); /* * pchild - called at interrupt level by the SIGCHLD signal diff --git a/bin/csh/sem.c b/bin/csh/sem.c index 10da22d5e15..9f1fad0c130 100644 --- a/bin/csh/sem.c +++ b/bin/csh/sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sem.c,v 1.9 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: sem.c,v 1.10 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: sem.c,v 1.9 1995/09/27 00:38:50 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: sem.c,v 1.9 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: sem.c,v 1.10 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -60,10 +60,10 @@ static char rcsid[] = "$OpenBSD: sem.c,v 1.9 2001/12/01 19:10:39 deraadt Exp $"; #include "proc.h" #include "extern.h" -static void vffree __P((int)); -static Char *splicepipe __P((struct command *t, Char *)); -static void doio __P((struct command *t, int *, int *)); -static void chkclob __P((char *)); +static void vffree(int); +static Char *splicepipe(struct command *t, Char *); +static void doio(struct command *t, int *, int *); +static void chkclob(char *); void execute(t, wanttty, pipein, pipeout) diff --git a/bin/csh/set.c b/bin/csh/set.c index 509aacdd19d..37c052afb11 100644 --- a/bin/csh/set.c +++ b/bin/csh/set.c @@ -1,4 +1,4 @@ -/* $OpenBSD: set.c,v 1.5 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: set.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: set.c,v 1.8 1995/03/21 18:35:52 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: set.c,v 1.5 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: set.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -56,18 +56,18 @@ static char rcsid[] = "$OpenBSD: set.c,v 1.5 2001/12/01 19:10:39 deraadt Exp $"; #include "csh.h" #include "extern.h" -static Char *getinx __P((Char *, int *)); -static void asx __P((Char *, int, Char *)); +static Char *getinx(Char *, int *); +static void asx(Char *, int, Char *); static struct varent - *getvx __P((Char *, int)); -static Char *xset __P((Char *, Char ***)); -static Char *operate __P((int, Char *, Char *)); -static void putn1 __P((int)); + *getvx(Char *, int); +static Char *xset(Char *, Char ***); +static Char *operate(int, Char *, Char *); +static void putn1(int); static struct varent - *madrof __P((Char *, struct varent *)); -static void unsetv1 __P((struct varent *)); -static void exportpath __P((Char **)); -static void balance __P((struct varent *, int, int)); + *madrof(Char *, struct varent *); +static void unsetv1(struct varent *); +static void exportpath(Char **); +static void balance(struct varent *, int, int); /* diff --git a/bin/csh/time.c b/bin/csh/time.c index 2d80f3c8248..b37b87aacec 100644 --- a/bin/csh/time.c +++ b/bin/csh/time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: time.c,v 1.6 2002/02/14 22:13:33 nordin Exp $ */ +/* $OpenBSD: time.c,v 1.7 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: time.c,v 1.7 1995/03/21 13:55:25 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: time.c,v 1.6 2002/02/14 22:13:33 nordin Exp $"; +static char rcsid[] = "$OpenBSD: time.c,v 1.7 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -55,7 +55,7 @@ static char rcsid[] = "$OpenBSD: time.c,v 1.6 2002/02/14 22:13:33 nordin Exp $"; /* * C Shell - routines handling process timing and niceing */ -static void pdeltat __P((struct timeval *, struct timeval *)); +static void pdeltat(struct timeval *, struct timeval *); void settimes() diff --git a/bin/date/date.c b/bin/date/date.c index 9b2c56a5800..ae5b6484e1a 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -1,4 +1,4 @@ -/* $OpenBSD: date.c,v 1.20 2002/01/16 18:44:21 mpech Exp $ */ +/* $OpenBSD: date.c,v 1.21 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: date.c,v 1.11 1995/09/07 06:21:05 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: date.c,v 1.20 2002/01/16 18:44:21 mpech Exp $"; +static char rcsid[] = "$OpenBSD: date.c,v 1.21 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -72,9 +72,9 @@ time_t tval; int retval, nflag; int slidetime; -static void setthetime __P((char *)); -static void badformat __P((void)); -static void usage __P((void)); +static void setthetime(char *); +static void badformat(void); +static void usage(void); int main(argc, argv) diff --git a/bin/date/extern.h b/bin/date/extern.h index 53a9ba68276..a2587249e22 100644 --- a/bin/date/extern.h +++ b/bin/date/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1996/06/23 14:19:43 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1995/03/21 09:03:52 cgd Exp $ */ /*- @@ -36,4 +36,4 @@ * @(#)extern.h 8.1 (Berkeley) 5/31/93 */ -int netsettime __P((time_t)); +int netsettime(time_t); diff --git a/bin/dd/args.c b/bin/dd/args.c index c04c07a1be6..015f8187550 100644 --- a/bin/dd/args.c +++ b/bin/dd/args.c @@ -1,4 +1,4 @@ -/* $OpenBSD: args.c,v 1.11 2001/10/06 22:31:54 millert Exp $ */ +/* $OpenBSD: args.c,v 1.12 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: args.c,v 1.7 1996/03/01 01:18:58 jtc Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: args.c,v 1.11 2001/10/06 22:31:54 millert Exp $"; +static char rcsid[] = "$OpenBSD: args.c,v 1.12 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -59,25 +59,25 @@ static char rcsid[] = "$OpenBSD: args.c,v 1.11 2001/10/06 22:31:54 millert Exp $ #include "dd.h" #include "extern.h" -static int c_arg __P((const void *, const void *)); -static int c_conv __P((const void *, const void *)); -static void f_bs __P((char *)); -static void f_cbs __P((char *)); -static void f_conv __P((char *)); -static void f_count __P((char *)); -static void f_files __P((char *)); -static void f_ibs __P((char *)); -static void f_if __P((char *)); -static void f_obs __P((char *)); -static void f_of __P((char *)); -static void f_seek __P((char *)); -static void f_skip __P((char *)); -static size_t get_bsz __P((char *)); -static off_t get_off __P((char *)); +static int c_arg(const void *, const void *); +static int c_conv(const void *, const void *); +static void f_bs(char *); +static void f_cbs(char *); +static void f_conv(char *); +static void f_count(char *); +static void f_files(char *); +static void f_ibs(char *); +static void f_if(char *); +static void f_obs(char *); +static void f_of(char *); +static void f_seek(char *); +static void f_skip(char *); +static size_t get_bsz(char *); +static off_t get_off(char *); static const struct arg { char *name; - void (*f) __P((char *)); + void (*f)(char *); u_int set, noset; } args[] = { { "bs", f_bs, C_BS, C_BS|C_IBS|C_OBS|C_OSYNC }, diff --git a/bin/dd/dd.c b/bin/dd/dd.c index a849ef2a626..54188437728 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dd.c,v 1.11 2001/10/06 22:31:54 millert Exp $ */ +/* $OpenBSD: dd.c,v 1.12 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: dd.c,v 1.6 1996/02/20 19:29:06 jtc Exp $ */ /*- @@ -48,7 +48,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: dd.c,v 1.11 2001/10/06 22:31:54 millert Exp $"; +static char rcsid[] = "$OpenBSD: dd.c,v 1.12 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -70,14 +70,14 @@ static char rcsid[] = "$OpenBSD: dd.c,v 1.11 2001/10/06 22:31:54 millert Exp $"; #include "dd.h" #include "extern.h" -static void dd_close __P((void)); -static void dd_in __P((void)); -static void getfdtype __P((IO *)); -static void setup __P((void)); +static void dd_close(void); +static void dd_in(void); +static void getfdtype(IO *); +static void setup(void); IO in, out; /* input/output state */ STAT st; /* statistics */ -void (*cfunc) __P((void)); /* conversion function */ +void (*cfunc)(void); /* conversion function */ size_t cpy_cnt; /* # of blocks to copy */ u_int ddflags; /* conversion options */ size_t cbsz; /* conversion block size */ diff --git a/bin/dd/extern.h b/bin/dd/extern.h index 2d0eca452f8..6beb89ce3b9 100644 --- a/bin/dd/extern.h +++ b/bin/dd/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 1997/02/14 07:05:21 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: extern.h,v 1.7 1996/02/20 19:29:07 jtc Exp $ */ /*- @@ -42,19 +42,19 @@ #include <sys/cdefs.h> -void block __P((void)); -void block_close __P((void)); -void dd_out __P((int)); -void def __P((void)); -void def_close __P((void)); -void jcl __P((char **)); -void pos_in __P((void)); -void pos_out __P((void)); -void summary __P((void)); -void summaryx __P((int)); -void terminate __P((int)); -void unblock __P((void)); -void unblock_close __P((void)); +void block(void); +void block_close(void); +void dd_out(int); +void def(void); +void def_close(void); +void jcl(char **); +void pos_in(void); +void pos_out(void); +void summary(void); +void summaryx(int); +void terminate(int); +void unblock(void); +void unblock_close(void); extern IO in, out; extern STAT st; diff --git a/bin/df/df.c b/bin/df/df.c index 29c549c7b75..2c0c1073fe9 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: df.c,v 1.30 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: df.c,v 1.31 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $ */ /* @@ -49,7 +49,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: df.c,v 1.30 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: df.c,v 1.31 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -68,19 +68,19 @@ static char rcsid[] = "$OpenBSD: df.c,v 1.30 2001/09/06 13:29:08 mpech Exp $"; extern char *__progname; -int bread __P((int, off_t, void *, int)); -char *getmntpt __P((char *)); -void bsdprint __P((struct statfs *, long, int)); -void posixprint __P((struct statfs *, long, int)); -int selected __P((const char *)); -void maketypelist __P((char *)); -long regetmntinfo __P((struct statfs **, long)); -void usage __P((void)); - -int raw_df __P((char *, struct statfs *)); -extern int ffs_df __P((int, char *, struct statfs *)); -extern int lfs_df __P((int, char *, struct statfs *)); -extern int e2fs_df __P((int, char *, struct statfs *)); +int bread(int, off_t, void *, int); +char *getmntpt(char *); +void bsdprint(struct statfs *, long, int); +void posixprint(struct statfs *, long, int); +int selected(const char *); +void maketypelist(char *); +long regetmntinfo(struct statfs **, long); +void usage(void); + +int raw_df(char *, struct statfs *); +extern int ffs_df(int, char *, struct statfs *); +extern int lfs_df(int, char *, struct statfs *); +extern int e2fs_df(int, char *, struct statfs *); int hflag, iflag, kflag, lflag, nflag, Pflag; char **typelist = NULL; diff --git a/bin/df/ext2fs_df.c b/bin/df/ext2fs_df.c index de3612862c6..cde48ad1c1f 100644 --- a/bin/df/ext2fs_df.c +++ b/bin/df/ext2fs_df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_df.c,v 1.7 2001/05/11 18:40:46 mickey Exp $ */ +/* $OpenBSD: ext2fs_df.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* * This file is substantially derived from src/sys/ufs/ext2fs/ext2fs_vfsops.c:e2fs_statfs(). @@ -52,10 +52,10 @@ #include <fcntl.h> #include <fstab.h> -int e2fs_df __P((int, char *, struct statfs *)); +int e2fs_df(int, char *, struct statfs *); -extern int bread __P((int, off_t, void *, int)); -extern char *getmntpt __P((char *)); +extern int bread(int, off_t, void *, int); +extern char *getmntpt(char *); union { struct ext2fs ie_fs; diff --git a/bin/df/ffs_df.c b/bin/df/ffs_df.c index b4081f7f019..b2e36afabc5 100644 --- a/bin/df/ffs_df.c +++ b/bin/df/ffs_df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_df.c,v 1.6 2001/05/11 18:40:46 mickey Exp $ */ +/* $OpenBSD: ffs_df.c,v 1.7 2002/02/16 21:27:06 millert Exp $ */ /* * Copyright (c) 1980, 1990, 1993, 1994 @@ -54,10 +54,10 @@ static char copyright[] = #include <string.h> #include <fcntl.h> -int ffs_df __P((int, char *, struct statfs *)); +int ffs_df(int, char *, struct statfs *); -extern int bread __P((int, off_t, void *, int)); -extern char *getmntpt __P((char *)); +extern int bread(int, off_t, void *, int); +extern char *getmntpt(char *); union { struct fs iu_fs; diff --git a/bin/df/lfs_df.c b/bin/df/lfs_df.c index f5824fd8bf0..eab3476719a 100644 --- a/bin/df/lfs_df.c +++ b/bin/df/lfs_df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_df.c,v 1.6 2001/05/11 18:40:46 mickey Exp $ */ +/* $OpenBSD: lfs_df.c,v 1.7 2002/02/16 21:27:06 millert Exp $ */ /* * This file is substantially duplicated from src/sys/ufs/lfs/lfs_vfsops.c:lfs_statfs(). @@ -52,10 +52,10 @@ #include <fcntl.h> #include <fstab.h> -int lfs_df __P((int, char *, struct statfs *)); +int lfs_df(int, char *, struct statfs *); -extern int bread __P((int, off_t, void *, int)); -extern char *getmntpt __P((char *)); +extern int bread(int, off_t, void *, int); +extern char *getmntpt(char *); union { struct lfs il_fs; diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c index 8ff5bb51421..01056e1d638 100644 --- a/bin/domainname/domainname.c +++ b/bin/domainname/domainname.c @@ -1,4 +1,4 @@ -/* $OpenBSD: domainname.c,v 1.4 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: domainname.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: domainname.c,v 1.7 1995/03/21 09:04:22 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: domainname.c,v 1.4 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: domainname.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: domainname.c,v 1.4 2001/09/06 13:29:08 mpech Ex extern char *__progname; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/bin/ed/ed.h b/bin/ed/ed.h index 45a78003364..72e2d7b8615 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ed.h,v 1.7 2001/07/05 22:30:15 espie Exp $ */ +/* $OpenBSD: ed.h,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: ed.h,v 1.23 1995/03/21 09:04:40 cgd Exp $ */ /* ed.h: type and constant definitions for the ed editor. */ @@ -199,80 +199,80 @@ if ((i) > (n)) { \ #endif /* Local Function Declarations */ -void add_line_node __P((line_t *)); -int append_lines __P((long)); -int apply_subst_template __P((char *, regmatch_t *, int, int)); -int build_active_list __P((int)); -int cbc_decode __P((char *, FILE *)); -int cbc_encode __P((char *, int, FILE *)); -int check_addr_range __P((long, long)); -void clear_active_list __P((void)); -void clear_undo_stack __P((void)); -int close_sbuf __P((void)); -int copy_lines __P((long)); -int delete_lines __P((long, long)); -void des_error __P((char *)); -int display_lines __P((long, long, int)); -line_t *dup_line_node __P((line_t *)); -int exec_command __P((void)); -long exec_global __P((int, int)); -void expand_des_key __P((char *, char *)); -int extract_addr_range __P((void)); -char *extract_pattern __P((int)); -int extract_subst_tail __P((int *, long *)); -char *extract_subst_template __P((void)); -int filter_lines __P((long, long, char *)); -int flush_des_file __P((FILE *)); -line_t *get_addressed_line_node __P((long)); -pattern_t *get_compiled_pattern __P((void)); -int get_des_char __P((FILE *)); -char *get_extended_line __P((int *, int)); -char *get_filename __P((void)); -int get_keyword __P((void)); -long get_line_node_addr __P((line_t *)); -long get_matching_node_addr __P((pattern_t *, int)); -long get_marked_node_addr __P((int)); -char *get_sbuf_line __P((line_t *)); -int get_shell_command __P((void)); -int get_stream_line __P((FILE *)); -int get_tty_line __P((void)); -void handle_hup __P((int)); -void handle_int __P((int)); -void handle_winch __P((int)); -int has_trailing_escape __P((char *, char *)); -int hex_to_binary __P((int, int)); -void init_buffers __P((void)); -void init_des_cipher __P((void)); -int is_legal_filename __P((char *)); -int join_lines __P((long, long)); -int mark_line_node __P((line_t *, int)); -int move_lines __P((long)); -line_t *next_active_node __P((void)); -long next_addr __P((void)); -int open_sbuf __P((void)); -char *parse_char_class __P((char *)); -int pop_undo_stack __P((void)); -undo_t *push_undo_stack __P((int, long, long)); -int put_des_char __P((int, FILE *)); -char *put_sbuf_line __P((char *)); -int put_stream_line __P((FILE *, char *, int)); -int put_tty_line __P((char *, int, long, int)); -void quit __P((int)); -long read_file __P((char *, long)); -long read_stream __P((FILE *, long)); -int search_and_replace __P((pattern_t *, int, int)); -int set_active_node __P((line_t *)); -void set_des_key __P((char *)); -void seterrmsg __P((char *)); -void signal_hup __P((int)); -void signal_int __P((int)); -char *strip_escapes __P((char *)); -int substitute_matching_text __P((pattern_t *, line_t *, int, int)); -char *translit_text __P((char *, int, int, int)); -void unmark_line_node __P((line_t *)); -void unset_active_nodes __P((line_t *, line_t *)); -long write_file __P((char *, char *, long, long)); -long write_stream __P((FILE *, long, long)); +void add_line_node(line_t *); +int append_lines(long); +int apply_subst_template(char *, regmatch_t *, int, int); +int build_active_list(int); +int cbc_decode(char *, FILE *); +int cbc_encode(char *, int, FILE *); +int check_addr_range(long, long); +void clear_active_list(void); +void clear_undo_stack(void); +int close_sbuf(void); +int copy_lines(long); +int delete_lines(long, long); +void des_error(char *); +int display_lines(long, long, int); +line_t *dup_line_node(line_t *); +int exec_command(void); +long exec_global(int, int); +void expand_des_key(char *, char *); +int extract_addr_range(void); +char *extract_pattern(int); +int extract_subst_tail(int *, long *); +char *extract_subst_template(void); +int filter_lines(long, long, char *); +int flush_des_file(FILE *); +line_t *get_addressed_line_node(long); +pattern_t *get_compiled_pattern(void); +int get_des_char(FILE *); +char *get_extended_line(int *, int); +char *get_filename(void); +int get_keyword(void); +long get_line_node_addr(line_t *); +long get_matching_node_addr(pattern_t *, int); +long get_marked_node_addr(int); +char *get_sbuf_line(line_t *); +int get_shell_command(void); +int get_stream_line(FILE *); +int get_tty_line(void); +void handle_hup(int); +void handle_int(int); +void handle_winch(int); +int has_trailing_escape(char *, char *); +int hex_to_binary(int, int); +void init_buffers(void); +void init_des_cipher(void); +int is_legal_filename(char *); +int join_lines(long, long); +int mark_line_node(line_t *, int); +int move_lines(long); +line_t *next_active_node(void); +long next_addr(void); +int open_sbuf(void); +char *parse_char_class(char *); +int pop_undo_stack(void); +undo_t *push_undo_stack(int, long, long); +int put_des_char(int, FILE *); +char *put_sbuf_line(char *); +int put_stream_line(FILE *, char *, int); +int put_tty_line(char *, int, long, int); +void quit(int); +long read_file(char *, long); +long read_stream(FILE *, long); +int search_and_replace(pattern_t *, int, int); +int set_active_node(line_t *); +void set_des_key(char *); +void seterrmsg(char *); +void signal_hup(int); +void signal_int(int); +char *strip_escapes(char *); +int substitute_matching_text(pattern_t *, line_t *, int, int); +char *translit_text(char *, int, int, int); +void unmark_line_node(line_t *); +void unset_active_nodes(line_t *, line_t *); +long write_file(char *, char *, long, long); +long write_stream(FILE *, long, long); /* global buffers */ extern char stdinbuf[]; diff --git a/bin/expr/expr.c b/bin/expr/expr.c index 6e6500e0f16..27c9de0f038 100644 --- a/bin/expr/expr.c +++ b/bin/expr/expr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: expr.c,v 1.9 1997/11/13 07:57:17 deraadt Exp $ */ +/* $OpenBSD: expr.c,v 1.10 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: expr.c,v 1.3.6.1 1996/06/04 20:41:47 cgd Exp $ */ /* @@ -225,7 +225,7 @@ error() struct val * eval6() { - struct val *eval0 __P((void)); + struct val *eval0(void); struct val *v; if (token == OPERAND) { diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c index 5c7d394db03..ca7775077cb 100644 --- a/bin/hostname/hostname.c +++ b/bin/hostname/hostname.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hostname.c,v 1.4 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: hostname.c,v 1.5 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: hostname.c,v 1.10 1995/09/07 06:28:40 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)hostname.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: hostname.c,v 1.4 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: hostname.c,v 1.5 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: hostname.c,v 1.4 2001/09/06 13:29:08 mpech Exp extern char *__progname; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/bin/kill/kill.c b/bin/kill/kill.c index d1d802569e4..83256b3d8cb 100644 --- a/bin/kill/kill.c +++ b/bin/kill/kill.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kill.c,v 1.4 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: kill.c,v 1.5 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: kill.c,v 1.11 1995/09/07 06:30:27 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: kill.c,v 1.4 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: kill.c,v 1.5 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -58,10 +58,10 @@ static char rcsid[] = "$OpenBSD: kill.c,v 1.4 2001/09/06 13:29:08 mpech Exp $"; extern char *__progname; -void nosig __P((char *)); -void printsignals __P((FILE *)); -int signame_to_signum __P((char *)); -void usage __P((void)); +void nosig(char *); +void printsignals(FILE *); +int signame_to_signum(char *); +void usage(void); int main(argc, argv) diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 43aa0a5b40c..284d99257d7 100644 --- a/bin/ln/ln.c +++ b/bin/ln/ln.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ln.c,v 1.6 2001/08/09 03:33:17 millert Exp $ */ +/* $OpenBSD: ln.c,v 1.7 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ln.c,v 1.10 1995/03/21 09:06:10 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; #else -static const char rcsid[] = "$OpenBSD: ln.c,v 1.6 2001/08/09 03:33:17 millert Exp $"; +static const char rcsid[] = "$OpenBSD: ln.c,v 1.7 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -63,10 +63,10 @@ int fflag; /* Unlink existing files. */ int hflag; /* Check new name for symlink first. */ int sflag; /* Symbolic, not hard, link. */ /* System link call. */ -int (*linkf) __P((const char *, const char *)); +int (*linkf)(const char *, const char *); -int linkit __P((char *, char *, int)); -void usage __P((void)); +int linkit(char *, char *, int); +void usage(void); int main(argc, argv) @@ -127,7 +127,7 @@ linkit(target, source, isdir) { struct stat sb; char *p, path[MAXPATHLEN]; - int (*statf) __P((const char *, struct stat *)); + int (*statf)(const char *, struct stat *); if (!sflag) { /* If target doesn't exist, quit now. */ diff --git a/bin/ls/extern.h b/bin/ls/extern.h index e11314382f3..cbde87f1ba2 100644 --- a/bin/ls/extern.h +++ b/bin/ls/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.7 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: extern.h,v 1.8 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: extern.h,v 1.5 1995/03/21 09:06:24 cgd Exp $ */ /*- @@ -38,21 +38,21 @@ extern char *__progname; -int acccmp __P((const FTSENT *, const FTSENT *)); -int revacccmp __P((const FTSENT *, const FTSENT *)); -int modcmp __P((const FTSENT *, const FTSENT *)); -int revmodcmp __P((const FTSENT *, const FTSENT *)); -int namecmp __P((const FTSENT *, const FTSENT *)); -int revnamecmp __P((const FTSENT *, const FTSENT *)); -int statcmp __P((const FTSENT *, const FTSENT *)); -int revstatcmp __P((const FTSENT *, const FTSENT *)); -int sizecmp __P((const FTSENT *, const FTSENT *)); -int revsizecmp __P((const FTSENT *, const FTSENT *)); +int acccmp(const FTSENT *, const FTSENT *); +int revacccmp(const FTSENT *, const FTSENT *); +int modcmp(const FTSENT *, const FTSENT *); +int revmodcmp(const FTSENT *, const FTSENT *); +int namecmp(const FTSENT *, const FTSENT *); +int revnamecmp(const FTSENT *, const FTSENT *); +int statcmp(const FTSENT *, const FTSENT *); +int revstatcmp(const FTSENT *, const FTSENT *); +int sizecmp(const FTSENT *, const FTSENT *); +int revsizecmp(const FTSENT *, const FTSENT *); -int putname __P((char *)); -void printcol __P((DISPLAY *)); -void printacol __P((DISPLAY *)); -void printlong __P((DISPLAY *)); -void printscol __P((DISPLAY *)); -void printstream __P((DISPLAY *)); -void usage __P((void)); +int putname(char *); +void printcol(DISPLAY *); +void printacol(DISPLAY *); +void printlong(DISPLAY *); +void printscol(DISPLAY *); +void printstream(DISPLAY *); +void usage(void); diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 1c75f2a31db..d281cc64c4e 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ls.c,v 1.15 2001/07/09 00:37:53 deraadt Exp $ */ +/* $OpenBSD: ls.c,v 1.16 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94"; #else -static char rcsid[] = "$OpenBSD: ls.c,v 1.15 2001/07/09 00:37:53 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ls.c,v 1.16 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -67,15 +67,15 @@ static char rcsid[] = "$OpenBSD: ls.c,v 1.15 2001/07/09 00:37:53 deraadt Exp $"; #include "ls.h" #include "extern.h" -char *group_from_gid __P((u_int, int)); -char *user_from_uid __P((u_int, int)); +char *group_from_gid(u_int, int); +char *user_from_uid(u_int, int); -static void display __P((FTSENT *, FTSENT *)); -static int mastercmp __P((const FTSENT **, const FTSENT **)); -static void traverse __P((int, char **, int)); +static void display(FTSENT *, FTSENT *); +static int mastercmp(const FTSENT **, const FTSENT **); +static void traverse(int, char **, int); -static void (*printfcn) __P((DISPLAY *)); -static int (*sortfcn) __P((const FTSENT *, const FTSENT *)); +static void (*printfcn)(DISPLAY *); +static int (*sortfcn)(const FTSENT *, const FTSENT *); #define BY_NAME 0 #define BY_SIZE 1 diff --git a/bin/ls/main.c b/bin/ls/main.c index 21a35e85730..544659b5978 100644 --- a/bin/ls/main.c +++ b/bin/ls/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.1 1999/02/23 23:54:17 art Exp $ */ +/* $OpenBSD: main.c,v 1.2 2002/02/16 21:27:07 millert Exp $ */ /* * Public domain - no warranty. @@ -6,7 +6,7 @@ #include <sys/cdefs.h> -int ls_main __P((int argc, char **argv)); +int ls_main(int argc, char **argv); int main(argc, argv) diff --git a/bin/ls/print.c b/bin/ls/print.c index c02aa56c843..77995c38176 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.15 2000/01/06 21:32:40 espie Exp $ */ +/* $OpenBSD: print.c,v 1.16 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.5 (Berkeley) 7/28/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.15 2000/01/06 21:32:40 espie Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.16 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -64,11 +64,11 @@ static char rcsid[] = "$OpenBSD: print.c,v 1.15 2000/01/06 21:32:40 espie Exp $" #include "ls.h" #include "extern.h" -static int printaname __P((FTSENT *, u_long, u_long)); -static void printlink __P((FTSENT *)); -static void printtime __P((time_t)); -static int printtype __P((u_int)); -static int compute_columns __P((DISPLAY *, int *)); +static int printaname(FTSENT *, u_long, u_long); +static void printlink(FTSENT *); +static void printtime(time_t); +static int printtype(u_int); +static int compute_columns(DISPLAY *, int *); #define IS_NOPRINT(p) ((p)->fts_number == NO_PRINT) diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index 2da6a1a8a24..4ddfe88b239 100644 --- a/bin/mkdir/mkdir.c +++ b/bin/mkdir/mkdir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkdir.c,v 1.11 2002/01/16 18:44:21 mpech Exp $ */ +/* $OpenBSD: mkdir.c,v 1.12 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: mkdir.c,v 1.14 1995/06/25 21:59:21 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94"; #else -static char rcsid[] = "$OpenBSD: mkdir.c,v 1.11 2002/01/16 18:44:21 mpech Exp $"; +static char rcsid[] = "$OpenBSD: mkdir.c,v 1.12 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -61,8 +61,8 @@ static char rcsid[] = "$OpenBSD: mkdir.c,v 1.11 2002/01/16 18:44:21 mpech Exp $" extern char *__progname; -int mkpath __P((char *, mode_t, mode_t)); -void usage __P((void)); +int mkpath(char *, mode_t, mode_t); +void usage(void); int main(argc, argv) diff --git a/bin/mt/mt.c b/bin/mt/mt.c index db50ed616df..cf713b172d8 100644 --- a/bin/mt/mt.c +++ b/bin/mt/mt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.c,v 1.19 2002/01/16 18:44:21 mpech Exp $ */ +/* $OpenBSD: mt.c,v 1.20 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: mt.c,v 1.14.2.1 1996/05/27 15:12:11 mrg Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mt.c 8.2 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: mt.c,v 1.19 2002/01/16 18:44:21 mpech Exp $"; +static char rcsid[] = "$OpenBSD: mt.c,v 1.20 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -96,9 +96,9 @@ struct commands { }; #define COM_EJECT 9 /* element in the above array */ -void printreg __P((char *, u_int, char *)); -void status __P((struct mtget *)); -void usage __P((void)); +void printreg(char *, u_int, char *); +void status(struct mtget *); +void usage(void); char *host = NULL; /* remote host (if any) */ diff --git a/bin/mt/mt.h b/bin/mt/mt.h index bf61843cb9e..2c6f0771bee 100644 --- a/bin/mt/mt.h +++ b/bin/mt/mt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.h,v 1.1 1996/03/08 23:34:21 niklas Exp $ */ +/* $OpenBSD: mt.h,v 1.2 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: mt.h,v 1.1 1996/03/05 20:39:36 scottr Exp $ */ /*- @@ -35,13 +35,13 @@ */ /* rmt routines */ -void rmtclose __P((void)); -int rmthost __P((char *host)); -int rmtopen __P((char *tape, int mode)); -int rmtioctl __P((int command, int count)); -struct mtget *rmtstatus __P((void)); +void rmtclose(void); +int rmthost(char *host); +int rmtopen(char *tape, int mode); +int rmtioctl(int command, int count); +struct mtget *rmtstatus(void); -void interrupt __P((int signo)); /* in case operator bangs on console */ +void interrupt(int signo); /* in case operator bangs on console */ /* * Exit status codes diff --git a/bin/mt/mtrmt.c b/bin/mt/mtrmt.c index 072877fc4eb..5654ad5ed54 100644 --- a/bin/mt/mtrmt.c +++ b/bin/mt/mtrmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtrmt.c,v 1.8 2001/11/14 20:52:39 deraadt Exp $ */ +/* $OpenBSD: mtrmt.c,v 1.9 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: mtrmt.c,v 1.2 1996/03/06 06:22:07 scottr Exp $ */ /*- @@ -81,14 +81,14 @@ static int rmtstate = TS_CLOSED; static int rmtape; static char *rmtpeer; -static int okname __P((char *)); -static int rmtcall __P((char *, char *)); -static void rmtconnaborted __P((void)); -static void sigrmtconnaborted __P((int)); -static int rmtgetb __P((void)); -static void rmtgetconn __P((void)); -static void rmtgets __P((char *, int)); -static int rmtreply __P((char *)); +static int okname(char *); +static int rmtcall(char *, char *); +static void rmtconnaborted(void); +static void sigrmtconnaborted(int); +static int rmtgetb(void); +static void rmtgetconn(void); +static void rmtgets(char *, int); +static int rmtreply(char *); int rmthost(host) diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 4a1189e5f0d..5c4c678b225 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mv.c,v 1.22 2002/01/25 07:10:04 millert Exp $ */ +/* $OpenBSD: mv.c,v 1.23 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: mv.c,v 1.9 1995/03/21 09:06:52 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: mv.c,v 1.22 2002/01/25 07:10:04 millert Exp $"; +static char rcsid[] = "$OpenBSD: mv.c,v 1.23 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -74,10 +74,10 @@ extern char *__progname; int fflg, iflg; int stdin_ok; -int copy __P((char *, char *)); -int do_move __P((char *, char *)); -int fastcopy __P((char *, char *, struct stat *)); -void usage __P((void)); +int copy(char *, char *); +int do_move(char *, char *); +int fastcopy(char *, char *, struct stat *); +void usage(void); int main(argc, argv) diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 23c34b4b16f..37e1561cd37 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar_io.c,v 1.24 2001/09/19 10:58:07 mpech Exp $ */ +/* $OpenBSD: ar_io.c,v 1.25 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ar_io.c,v 1.24 2001/09/19 10:58:07 mpech Exp $"; +static char rcsid[] = "$OpenBSD: ar_io.c,v 1.25 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -90,9 +90,9 @@ char *arcname; /* printable name of archive */ const char *gzip_program; /* name of gzip program */ static pid_t zpid = -1; /* pid of child process */ -static int get_phys __P((void)); +static int get_phys(void); extern sigset_t s_mask; -static void ar_start_gzip __P((int, const char *, int)); +static void ar_start_gzip(int, const char *, int); /* * ar_open() diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index 591af8ba333..c5ceee60c88 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar_subs.c,v 1.16 2001/07/17 18:19:48 millert Exp $ */ +/* $OpenBSD: ar_subs.c,v 1.17 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.16 2001/07/17 18:19:48 millert Exp $"; +static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.17 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -60,9 +60,9 @@ static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.16 2001/07/17 18:19:48 millert Ex #include "pax.h" #include "extern.h" -static void wr_archive __P((register ARCHD *, int is_app)); -static int get_arc __P((void)); -static int next_head __P((register ARCHD *)); +static void wr_archive(register ARCHD *, int is_app); +static int get_arc(void); +static int next_head(register ARCHD *); extern sigset_t s_mask; /* diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index e70955d5df2..5d75a0567f9 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpio.c,v 1.7 2001/05/26 00:32:21 millert Exp $ */ +/* $OpenBSD: cpio.c,v 1.8 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: cpio.c,v 1.7 2001/05/26 00:32:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: cpio.c,v 1.8 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -58,9 +58,9 @@ static char rcsid[] = "$OpenBSD: cpio.c,v 1.7 2001/05/26 00:32:21 millert Exp $" #include "cpio.h" #include "extern.h" -static int rd_nm __P((register ARCHD *, int)); -static int rd_ln_nm __P((register ARCHD *)); -static int com_rd __P((register ARCHD *)); +static int rd_nm(register ARCHD *, int); +static int rd_ln_nm(register ARCHD *); +static int com_rd(register ARCHD *); /* * Routines which support the different cpio versions diff --git a/bin/pax/extern.h b/bin/pax/extern.h index d534dfe8147..405db195460 100644 --- a/bin/pax/extern.h +++ b/bin/pax/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.20 2001/07/17 18:19:49 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.21 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: extern.h,v 1.5 1996/03/26 23:54:16 mrg Exp $ */ /*- @@ -51,27 +51,27 @@ */ extern char *arcname; extern const char *gzip_program; -int ar_open __P((char *)); -void ar_close __P((void)); -void ar_drain __P((void)); -int ar_set_wr __P((void)); -int ar_app_ok __P((void)); -int ar_read __P((register char *, register int)); -int ar_write __P((register char *, register int)); -int ar_rdsync __P((void)); -int ar_fow __P((off_t, off_t *)); -int ar_rev __P((off_t )); -int ar_next __P((void)); +int ar_open(char *); +void ar_close(void); +void ar_drain(void); +int ar_set_wr(void); +int ar_app_ok(void); +int ar_read(register char *, register int); +int ar_write(register char *, register int); +int ar_rdsync(void); +int ar_fow(off_t, off_t *); +int ar_rev(off_t ); +int ar_next(void); /* * ar_subs.c */ extern u_long flcnt; -void list __P((void)); -void extract __P((void)); -void append __P((void)); -void archive __P((void)); -void copy __P((void)); +void list(void); +void extract(void); +void append(void); +void archive(void); +void copy(void); /* * buf_subs.c @@ -83,126 +83,126 @@ extern int rdblksz; extern off_t wrlimit; extern off_t rdcnt; extern off_t wrcnt; -int wr_start __P((void)); -int rd_start __P((void)); -void cp_start __P((void)); -int appnd_start __P((off_t)); -int rd_sync __P((void)); -void pback __P((char *, int)); -int rd_skip __P((off_t)); -void wr_fin __P((void)); -int wr_rdbuf __P((register char *, register int)); -int rd_wrbuf __P((register char *, register int)); -int wr_skip __P((off_t)); -int wr_rdfile __P((ARCHD *, int, off_t *)); -int rd_wrfile __P((ARCHD *, int, off_t *)); -void cp_file __P((ARCHD *, int, int)); -int buf_fill __P((void)); -int buf_flush __P((register int)); +int wr_start(void); +int rd_start(void); +void cp_start(void); +int appnd_start(off_t); +int rd_sync(void); +void pback(char *, int); +int rd_skip(off_t); +void wr_fin(void); +int wr_rdbuf(register char *, register int); +int rd_wrbuf(register char *, register int); +int wr_skip(off_t); +int wr_rdfile(ARCHD *, int, off_t *); +int rd_wrfile(ARCHD *, int, off_t *); +void cp_file(ARCHD *, int, int); +int buf_fill(void); +int buf_flush(register int); /* * cache.c */ -int uidtb_start __P((void)); -int gidtb_start __P((void)); -int usrtb_start __P((void)); -int grptb_start __P((void)); -char * name_uid __P((uid_t, int)); -char * name_gid __P((gid_t, int)); -int uid_name __P((char *, uid_t *)); -int gid_name __P((char *, gid_t *)); +int uidtb_start(void); +int gidtb_start(void); +int usrtb_start(void); +int grptb_start(void); +char * name_uid(uid_t, int); +char * name_gid(gid_t, int); +int uid_name(char *, uid_t *); +int gid_name(char *, gid_t *); /* * cpio.c */ -int cpio_strd __P((void)); -int cpio_trail __P((register ARCHD *)); -int cpio_endwr __P((void)); -int cpio_id __P((char *, int)); -int cpio_rd __P((register ARCHD *, register char *)); -off_t cpio_endrd __P((void)); -int cpio_stwr __P((void)); -int cpio_wr __P((register ARCHD *)); -int vcpio_id __P((char *, int)); -int crc_id __P((char *, int)); -int crc_strd __P((void)); -int vcpio_rd __P((register ARCHD *, register char *)); -off_t vcpio_endrd __P((void)); -int crc_stwr __P((void)); -int vcpio_wr __P((register ARCHD *)); -int bcpio_id __P((char *, int)); -int bcpio_rd __P((register ARCHD *, register char *)); -off_t bcpio_endrd __P((void)); -int bcpio_wr __P((register ARCHD *)); +int cpio_strd(void); +int cpio_trail(register ARCHD *); +int cpio_endwr(void); +int cpio_id(char *, int); +int cpio_rd(register ARCHD *, register char *); +off_t cpio_endrd(void); +int cpio_stwr(void); +int cpio_wr(register ARCHD *); +int vcpio_id(char *, int); +int crc_id(char *, int); +int crc_strd(void); +int vcpio_rd(register ARCHD *, register char *); +off_t vcpio_endrd(void); +int crc_stwr(void); +int vcpio_wr(register ARCHD *); +int bcpio_id(char *, int); +int bcpio_rd(register ARCHD *, register char *); +off_t bcpio_endrd(void); +int bcpio_wr(register ARCHD *); /* * file_subs.c */ -int file_creat __P((register ARCHD *)); -void file_close __P((register ARCHD *, int)); -int lnk_creat __P((register ARCHD *)); -int cross_lnk __P((register ARCHD *)); -int chk_same __P((register ARCHD *)); -int node_creat __P((register ARCHD *)); -int unlnk_exist __P((register char *, register int)); -int chk_path __P((register char *, uid_t, gid_t)); -void set_ftime __P((char *fnm, time_t mtime, time_t atime, int frc)); -int set_ids __P((char *, uid_t, gid_t)); -int set_lids __P((char *, uid_t, gid_t)); -void set_pmode __P((char *, mode_t)); -int file_write __P((int, char *, register int, int *, int *, int, char *)); -void file_flush __P((int, char *, int)); -void rdfile_close __P((register ARCHD *, register int *)); -int set_crc __P((register ARCHD *, register int)); +int file_creat(register ARCHD *); +void file_close(register ARCHD *, int); +int lnk_creat(register ARCHD *); +int cross_lnk(register ARCHD *); +int chk_same(register ARCHD *); +int node_creat(register ARCHD *); +int unlnk_exist(register char *, register int); +int chk_path(register char *, uid_t, gid_t); +void set_ftime(char *fnm, time_t mtime, time_t atime, int frc); +int set_ids(char *, uid_t, gid_t); +int set_lids(char *, uid_t, gid_t); +void set_pmode(char *, mode_t); +int file_write(int, char *, register int, int *, int *, int, char *); +void file_flush(int, char *, int); +void rdfile_close(register ARCHD *, register int *); +int set_crc(register ARCHD *, register int); /* * ftree.c */ -int ftree_start __P((void)); -int ftree_add __P((register char *, int)); -void ftree_sel __P((register ARCHD *)); -void ftree_chk __P((void)); -int next_file __P((register ARCHD *)); +int ftree_start(void); +int ftree_add(register char *, int); +void ftree_sel(register ARCHD *); +void ftree_chk(void); +int next_file(register ARCHD *); /* * gen_subs.c */ -void ls_list __P((register ARCHD *, time_t, FILE *)); -void ls_tty __P((register ARCHD *)); -void safe_print __P((char *, FILE *)); -u_long asc_ul __P((register char *, int, register int)); -int ul_asc __P((u_long, register char *, register int, register int)); +void ls_list(register ARCHD *, time_t, FILE *); +void ls_tty(register ARCHD *); +void safe_print(char *, FILE *); +u_long asc_ul(register char *, int, register int); +int ul_asc(u_long, register char *, register int, register int); #ifndef LONG_OFF_T -u_quad_t asc_uqd __P((register char *, int, register int)); -int uqd_asc __P((u_quad_t, register char *, register int, register int)); +u_quad_t asc_uqd(register char *, int, register int); +int uqd_asc(u_quad_t, register char *, register int, register int); #endif /* * getoldopt.c */ -int getoldopt __P((int, char **, char *)); +int getoldopt(int, char **, char *); /* * options.c */ extern FSUB fsub[]; extern int ford[]; -void options __P((register int, register char **)); -OPLIST * opt_next __P((void)); -int opt_add __P((register char *)); -int bad_opt __P((void)); +void options(register int, register char **); +OPLIST * opt_next(void); +int opt_add(register char *); +int bad_opt(void); char *chdname; /* * pat_rep.c */ -int rep_add __P((register char *)); -int pat_add __P((char *, char *)); -void pat_chk __P((void)); -int pat_sel __P((register ARCHD *)); -int pat_match __P((register ARCHD *)); -int mod_name __P((register ARCHD *)); -int set_dest __P((register ARCHD *, char *, int)); +int rep_add(register char *); +int pat_add(char *, char *); +void pat_chk(void); +int pat_sel(register ARCHD *); +int pat_match(register ARCHD *); +int mod_name(register ARCHD *); +int set_dest(register ARCHD *, char *, int); /* * pax.c @@ -241,62 +241,62 @@ extern FILE *listf; extern char *tempfile; extern char *tempbase; -int main __P((int, char **)); -void sig_cleanup __P((int)); +int main(int, char **); +void sig_cleanup(int); /* * sel_subs.c */ -int sel_chk __P((register ARCHD *)); -int grp_add __P((register char *)); -int usr_add __P((register char *)); -int trng_add __P((register char *)); +int sel_chk(register ARCHD *); +int grp_add(register char *); +int usr_add(register char *); +int trng_add(register char *); /* * tables.c */ -int lnk_start __P((void)); -int chk_lnk __P((register ARCHD *)); -void purg_lnk __P((register ARCHD *)); -void lnk_end __P((void)); -int ftime_start __P((void)); -int chk_ftime __P((register ARCHD *)); -int name_start __P((void)); -int add_name __P((register char *, int, char *)); -void sub_name __P((register char *, int *, size_t)); -int dev_start __P((void)); -int add_dev __P((register ARCHD *)); -int map_dev __P((register ARCHD *, u_long, u_long)); -int atdir_start __P((void)); -void atdir_end __P((void)); -void add_atdir __P((char *, dev_t, ino_t, time_t, time_t)); -int get_atdir __P((dev_t, ino_t, time_t *, time_t *)); -int dir_start __P((void)); -void add_dir __P((char *, int, struct stat *, int)); -void proc_dir __P((void)); -u_int st_hash __P((char *, int, int)); +int lnk_start(void); +int chk_lnk(register ARCHD *); +void purg_lnk(register ARCHD *); +void lnk_end(void); +int ftime_start(void); +int chk_ftime(register ARCHD *); +int name_start(void); +int add_name(register char *, int, char *); +void sub_name(register char *, int *, size_t); +int dev_start(void); +int add_dev(register ARCHD *); +int map_dev(register ARCHD *, u_long, u_long); +int atdir_start(void); +void atdir_end(void); +void add_atdir(char *, dev_t, ino_t, time_t, time_t); +int get_atdir(dev_t, ino_t, time_t *, time_t *); +int dir_start(void); +void add_dir(char *, int, struct stat *, int); +void proc_dir(void); +u_int st_hash(char *, int, int); /* * tar.c */ -int tar_endwr __P((void)); -off_t tar_endrd __P((void)); -int tar_trail __P((register char *, register int, register int *)); -int tar_id __P((register char *, int)); -int tar_opt __P((void)); -int tar_rd __P((register ARCHD *, register char *)); -int tar_wr __P((register ARCHD *)); -int ustar_strd __P((void)); -int ustar_stwr __P((void)); -int ustar_id __P((char *, int)); -int ustar_rd __P((register ARCHD *, register char *)); -int ustar_wr __P((register ARCHD *)); +int tar_endwr(void); +off_t tar_endrd(void); +int tar_trail(register char *, register int, register int *); +int tar_id(register char *, int); +int tar_opt(void); +int tar_rd(register ARCHD *, register char *); +int tar_wr(register ARCHD *); +int ustar_strd(void); +int ustar_stwr(void); +int ustar_id(char *, int); +int ustar_rd(register ARCHD *, register char *); +int ustar_wr(register ARCHD *); /* * tty_subs.c */ -int tty_init __P((void)); -void tty_prnt __P((char *, ...)); -int tty_read __P((char *, int)); -void paxwarn __P((int, char *, ...)); -void syswarn __P((int, int, char *, ...)); +int tty_init(void); +void tty_prnt(char *, ...); +int tty_read(char *, int); +void paxwarn(int, char *, ...); +void syswarn(int, int, char *, ...); diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 5288e390c2a..8138094c8d2 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file_subs.c,v 1.15 2001/10/25 16:59:03 niklas Exp $ */ +/* $OpenBSD: file_subs.c,v 1.16 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: file_subs.c,v 1.15 2001/10/25 16:59:03 niklas Exp $"; +static char rcsid[] = "$OpenBSD: file_subs.c,v 1.16 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -62,7 +62,7 @@ static char rcsid[] = "$OpenBSD: file_subs.c,v 1.15 2001/10/25 16:59:03 niklas E #include "extern.h" static int -mk_link __P((register char *,register struct stat *,register char *, int)); +mk_link(register char *,register struct stat *,register char *, int); /* * routines that deal with file operations such as: creating, removing; diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index 9754c62e2a3..c5e400409a5 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftree.c,v 1.16 2001/05/26 00:32:21 millert Exp $ */ +/* $OpenBSD: ftree.c,v 1.17 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ftree.c,v 1.4 1995/03/21 09:07:21 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ftree.c,v 1.16 2001/05/26 00:32:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: ftree.c,v 1.17 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -83,7 +83,7 @@ static FTREE *ftcur = NULL; /* current file arg being processed */ static FTSENT *ftent = NULL; /* current file tree entry */ static int ftree_skip; /* when set skip to next file arg */ -static int ftree_arg __P((void)); +static int ftree_arg(void); /* * ftree_start() diff --git a/bin/pax/options.c b/bin/pax/options.c index 46d5f6846fa..95192097057 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.48 2001/05/26 00:32:21 millert Exp $ */ +/* $OpenBSD: options.c,v 1.49 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: options.c,v 1.48 2001/05/26 00:32:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: options.c,v 1.49 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -72,17 +72,17 @@ static char flgch[] = FLGCH; /* list of all possible flags */ static OPLIST *ophead = NULL; /* head for format specific options -x */ static OPLIST *optail = NULL; /* option tail */ -static int no_op __P((void)); -static void printflg __P((unsigned int)); -static int c_frmt __P((const void *, const void *)); -static off_t str_offt __P((char *)); -static char *getline __P((FILE *fp)); -static void pax_options __P((register int, register char **)); -static void pax_usage __P((void)); -static void tar_options __P((register int, register char **)); -static void tar_usage __P((void)); -static void cpio_options __P((register int, register char **)); -static void cpio_usage __P((void)); +static int no_op(void); +static void printflg(unsigned int); +static int c_frmt(const void *, const void *); +static off_t str_offt(char *); +static char *getline(FILE *fp); +static void pax_options(register int, register char **); +static void pax_usage(void); +static void tar_options(register int, register char **); +static void tar_usage(void); +static void cpio_options(register int, register char **); +static void cpio_usage(void); /* errors from getline */ #define GETLINE_FILE_CORRUPT 1 diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index 37be97f45f7..9e9474f755e 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pat_rep.c,v 1.15 2001/07/04 22:34:17 millert Exp $ */ +/* $OpenBSD: pat_rep.c,v 1.16 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: pat_rep.c,v 1.15 2001/07/04 22:34:17 millert Exp $"; +static char rcsid[] = "$OpenBSD: pat_rep.c,v 1.16 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -73,12 +73,12 @@ static PATTERN *pattail = NULL; /* file pattern match list tail */ static REPLACE *rephead = NULL; /* replacement string list head */ static REPLACE *reptail = NULL; /* replacement string list tail */ -static int rep_name __P((char *, int *, int)); -static int tty_rename __P((register ARCHD *)); -static int fix_path __P((char *, int *, char *, int)); -static int fn_match __P((register char *, register char *, char **)); -static char * range_match __P((register char *, register int)); -static int resub __P((regex_t *, regmatch_t *, char *, char *, char *, char *)); +static int rep_name(char *, int *, int); +static int tty_rename(register ARCHD *); +static int fix_path(char *, int *, char *, int); +static int fn_match(register char *, register char *, char **); +static char * range_match(register char *, register int); +static int resub(regex_t *, regmatch_t *, char *, char *, char *, char *); /* * rep_add() diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 07484ea6b26..91f3fc8e2db 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pax.c,v 1.18 2001/11/05 09:38:52 deraadt Exp $ */ +/* $OpenBSD: pax.c,v 1.19 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $ */ /*- @@ -48,7 +48,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: pax.c,v 1.18 2001/11/05 09:38:52 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: pax.c,v 1.19 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -68,7 +68,7 @@ static char rcsid[] = "$OpenBSD: pax.c,v 1.18 2001/11/05 09:38:52 deraadt Exp $" #include <paths.h> #include "pax.h" #include "extern.h" -static int gen_init __P((void)); +static int gen_init(void); /* * PAX main routines, general globals and some simple start up routines diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index 83cfdd4d2a4..34f4512e017 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sel_subs.c,v 1.8 2001/05/26 00:32:21 millert Exp $ */ +/* $OpenBSD: sel_subs.c,v 1.9 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.8 2001/05/26 00:32:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.9 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -60,10 +60,10 @@ static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.8 2001/05/26 00:32:21 millert Ex #include "sel_subs.h" #include "extern.h" -static int str_sec __P((register char *, time_t *)); -static int usr_match __P((register ARCHD *)); -static int grp_match __P((register ARCHD *)); -static int trng_match __P((register ARCHD *)); +static int str_sec(register char *, time_t *); +static int usr_match(register ARCHD *); +static int grp_match(register ARCHD *); +static int trng_match(register ARCHD *); static TIME_RNG *trhead = NULL; /* time range list head */ static TIME_RNG *trtail = NULL; /* time range list tail */ diff --git a/bin/pax/tables.c b/bin/pax/tables.c index aee18b3af0e..ebdfdf0de29 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tables.c,v 1.13 2001/05/16 03:04:58 mickey Exp $ */ +/* $OpenBSD: tables.c,v 1.14 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: tables.c,v 1.13 2001/05/16 03:04:58 mickey Exp $"; +static char rcsid[] = "$OpenBSD: tables.c,v 1.14 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -84,7 +84,7 @@ static int dirfd = -1; /* storage for setting created dir time/mode */ static u_long dircnt; /* entries in dir time/mode storage */ static int ffd = -1; /* tmp file for file time table name storage */ -static DEVT *chk_dev __P((dev_t, int)); +static DEVT *chk_dev(dev_t, int); /* * hard link table routines diff --git a/bin/pax/tar.c b/bin/pax/tar.c index 602a968ac5a..adf8967b298 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tar.c,v 1.23 2001/12/19 22:51:32 millert Exp $ */ +/* $OpenBSD: tar.c,v 1.24 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: tar.c,v 1.23 2001/12/19 22:51:32 millert Exp $"; +static char rcsid[] = "$OpenBSD: tar.c,v 1.24 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -62,11 +62,11 @@ static char rcsid[] = "$OpenBSD: tar.c,v 1.23 2001/12/19 22:51:32 millert Exp $" * Routines for reading, writing and header identify of various versions of tar */ -static u_long tar_chksm __P((register char *, register int)); -static char *name_split __P((register char *, register int)); -static int ul_oct __P((u_long, register char *, register int, int)); +static u_long tar_chksm(register char *, register int); +static char *name_split(register char *, register int); +static int ul_oct(u_long, register char *, register int, int); #ifndef LONG_OFF_T -static int uqd_oct __P((u_quad_t, register char *, register int, int)); +static int uqd_oct(u_quad_t, register char *, register int, int); #endif /* diff --git a/bin/ps/extern.h b/bin/ps/extern.h index 428381e3030..d1c60e97cca 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.6 2001/12/05 02:23:59 art Exp $ */ +/* $OpenBSD: extern.h,v 1.7 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: extern.h,v 1.10 1995/05/21 13:38:27 mycroft Exp $ */ /*- @@ -48,42 +48,42 @@ extern VAR var[]; extern VARENT *vhead; __BEGIN_DECLS -void command __P((KINFO *, VARENT *)); -void cputime __P((KINFO *, VARENT *)); -int donlist __P((void)); -void evar __P((KINFO *, VARENT *)); -void emulname __P((KINFO *, VARENT *)); -void fmt_puts __P((char *, int *)); -void fmt_putc __P((int, int *)); -double getpcpu __P((KINFO *)); -double getpmem __P((KINFO *)); -void gname __P((KINFO *, VARENT *)); -void logname __P((KINFO *, VARENT *)); -void longtname __P((KINFO *, VARENT *)); -void lstarted __P((KINFO *, VARENT *)); -void maxrss __P((KINFO *, VARENT *)); -void nlisterr __P((struct nlist *)); -void p_rssize __P((KINFO *, VARENT *)); -void pagein __P((KINFO *, VARENT *)); -void parsefmt __P((char *)); -void pcpu __P((KINFO *, VARENT *)); -void pmem __P((KINFO *, VARENT *)); -void pri __P((KINFO *, VARENT *)); -void printheader __P((void)); -void pvar __P((KINFO *, VARENT *)); -void rgname __P((KINFO *, VARENT *)); -void rssize __P((KINFO *, VARENT *)); -void runame __P((KINFO *, VARENT *)); -void rvar __P((KINFO *, VARENT *)); -void showkey __P((void)); -void started __P((KINFO *, VARENT *)); -void state __P((KINFO *, VARENT *)); -void tdev __P((KINFO *, VARENT *)); -void tname __P((KINFO *, VARENT *)); -void tsize __P((KINFO *, VARENT *)); -void ucomm __P((KINFO *, VARENT *)); -void uname __P((KINFO *, VARENT *)); -void uvar __P((KINFO *, VARENT *)); -void vsize __P((KINFO *, VARENT *)); -void wchan __P((KINFO *, VARENT *)); +void command(KINFO *, VARENT *); +void cputime(KINFO *, VARENT *); +int donlist(void); +void evar(KINFO *, VARENT *); +void emulname(KINFO *, VARENT *); +void fmt_puts(char *, int *); +void fmt_putc(int, int *); +double getpcpu(KINFO *); +double getpmem(KINFO *); +void gname(KINFO *, VARENT *); +void logname(KINFO *, VARENT *); +void longtname(KINFO *, VARENT *); +void lstarted(KINFO *, VARENT *); +void maxrss(KINFO *, VARENT *); +void nlisterr(struct nlist *); +void p_rssize(KINFO *, VARENT *); +void pagein(KINFO *, VARENT *); +void parsefmt(char *); +void pcpu(KINFO *, VARENT *); +void pmem(KINFO *, VARENT *); +void pri(KINFO *, VARENT *); +void printheader(void); +void pvar(KINFO *, VARENT *); +void rgname(KINFO *, VARENT *); +void rssize(KINFO *, VARENT *); +void runame(KINFO *, VARENT *); +void rvar(KINFO *, VARENT *); +void showkey(void); +void started(KINFO *, VARENT *); +void state(KINFO *, VARENT *); +void tdev(KINFO *, VARENT *); +void tname(KINFO *, VARENT *); +void tsize(KINFO *, VARENT *); +void ucomm(KINFO *, VARENT *); +void uname(KINFO *, VARENT *); +void uvar(KINFO *, VARENT *); +void vsize(KINFO *, VARENT *); +void wchan(KINFO *, VARENT *); __END_DECLS diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index a1543a515fd..3bebf9813c6 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyword.c,v 1.13 1998/11/25 22:33:38 aaron Exp $ */ +/* $OpenBSD: keyword.c,v 1.14 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: keyword.c,v 1.13 1998/11/25 22:33:38 aaron Exp $"; +static char rcsid[] = "$OpenBSD: keyword.c,v 1.14 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -59,8 +59,8 @@ static char rcsid[] = "$OpenBSD: keyword.c,v 1.13 1998/11/25 22:33:38 aaron Exp #include <sys/ucred.h> #include <sys/sysctl.h> -static VAR *findvar __P((char *)); -static int vcmp __P((const void *, const void *)); +static VAR *findvar(char *); +static int vcmp(const void *, const void *); #ifdef NOTINUSE int utime(), stime(), ixrss(), idrss(), isrss(); diff --git a/bin/ps/print.c b/bin/ps/print.c index 32e31296841..435ad6d7e90 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $ */ +/* $OpenBSD: print.c,v 1.25 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.25 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -70,7 +70,7 @@ static char rcsid[] = "$OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $" extern kvm_t *kd; extern int needenv, needcomm, commandonly; -static char *cmdpart __P((char *)); +static char *cmdpart(char *); #define min(a,b) ((a) < (b) ? (a) : (b)) diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 16cea0d3162..0de41a6d90f 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ps.c,v 1.25 2002/01/30 17:52:40 mickey Exp $ */ +/* $OpenBSD: ps.c,v 1.26 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: ps.c,v 1.25 2002/01/30 17:52:40 mickey Exp $"; +static char rcsid[] = "$OpenBSD: ps.c,v 1.26 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -89,11 +89,11 @@ int needcomm, needenv, commandonly; enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT; -static char *kludge_oldps_options __P((char *)); -static int pscomp __P((const void *, const void *)); -static void saveuser __P((KINFO *)); -static void scanvars __P((void)); -static void usage __P((void)); +static char *kludge_oldps_options(char *); +static int pscomp(const void *, const void *); +static void saveuser(KINFO *); +static void scanvars(void); +static void usage(void); char dfmt[] = "pid tt state time command"; char jfmt[] = "user pid ppid pgid sess jobc state tt time command"; diff --git a/bin/ps/ps.h b/bin/ps/ps.h index 0e72896a5f9..6cb0ab8814b 100644 --- a/bin/ps/ps.h +++ b/bin/ps/ps.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ps.h,v 1.3 1997/08/08 19:30:10 millert Exp $ */ +/* $OpenBSD: ps.h,v 1.4 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ps.h,v 1.11 1995/09/29 21:57:03 cgd Exp $ */ /*- @@ -74,7 +74,7 @@ typedef struct var { #define INF127 0x08 /* 127 = infinity: if > 127, print 127. */ u_int flag; /* output routine */ - void (*oproc) __P((struct kinfo *, struct varent *)); + void (*oproc)(struct kinfo *, struct varent *); short width; /* printing width */ char parsed; /* have we been parsed yet? (avoid dupes) */ /* diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index 444fb02d62d..46b2bb9da11 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwd.c,v 1.6 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: pwd.c,v 1.7 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: pwd.c,v 1.7 1995/03/21 09:08:18 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94"; #else -static char rcsid[] = "$OpenBSD: pwd.c,v 1.6 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: pwd.c,v 1.7 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -55,7 +55,7 @@ static char rcsid[] = "$OpenBSD: pwd.c,v 1.6 2001/09/06 13:29:08 mpech Exp $"; extern char *__progname; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h index b909d9524de..4ab443f10a4 100644 --- a/bin/rcp/extern.h +++ b/bin/rcp/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: extern.h,v 1.2 1995/03/21 08:19:01 cgd Exp $ */ /*- @@ -44,11 +44,11 @@ typedef struct { extern int iamremote; extern char *__progname; -BUF *allocbuf __P((BUF *, int, int)); -char *colon __P((char *)); -void lostconn __P((int)); -void nospace __P((void)); -int okname __P((char *)); -void run_err __P((const char *, ...)); -int susystem __P((char *, int)); -void verifydir __P((char *)); +BUF *allocbuf(BUF *, int, int); +char *colon(char *); +void lostconn(int); +void nospace(void); +int okname(char *); +void run_err(const char *, ...); +int susystem(char *, int); +void verifydir(char *); diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index 5e9126277ba..3368beab00d 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcp.c,v 1.25 2001/11/21 15:35:28 markus Exp $ */ +/* $OpenBSD: rcp.c,v 1.26 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */ /* @@ -99,20 +99,20 @@ int pflag, iamremote, iamrecursive, targetshouldbedirectory; char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */ #ifdef KERBEROS -int kerberos __P((char **, char *, char *, char *)); -void oldw __P((const char *, ...)); +int kerberos(char **, char *, char *, char *); +void oldw(const char *, ...); /* XXX from ../../usr.bin/rlogin/krcmd.c */ -int krcmd __P((char **, u_short, char *, char *, int *, char *)); +int krcmd(char **, u_short, char *, char *, int *, char *); int krcmd_mutual __P((char **, u_short, char *, char *, int *, char *, CREDENTIALS *, Key_schedule)); #endif -int response __P((void)); -void rsource __P((char *, struct stat *)); -void sink __P((int, char *[])); -void source __P((int, char *[])); -void tolocal __P((int, char *[])); -void toremote __P((char *, int, char *[])); -void usage __P((void)); +int response(void); +void rsource(char *, struct stat *); +void sink(int, char *[]); +void source(int, char *[]); +void tolocal(int, char *[]); +void toremote(char *, int, char *[]); +void usage(void); int main(argc, argv) diff --git a/bin/rm/rm.c b/bin/rm/rm.c index b5f763c201f..587e0893a14 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rm.c,v 1.11 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: rm.c,v 1.12 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: rm.c,v 1.19 1995/09/07 06:48:50 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rm.c 8.8 (Berkeley) 4/27/95"; #else -static char rcsid[] = "$OpenBSD: rm.c,v 1.11 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: rm.c,v 1.12 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -69,12 +69,12 @@ extern char *__progname; int dflag, eval, fflag, iflag, Pflag, Wflag, stdin_ok; -int check __P((char *, char *, struct stat *)); -void checkdot __P((char **)); -void rm_file __P((char **)); -void rm_overwrite __P((char *, struct stat *)); -void rm_tree __P((char **)); -void usage __P((void)); +int check(char *, char *, struct stat *); +void checkdot(char **); +void rm_file(char **); +void rm_overwrite(char *, struct stat *); +void rm_tree(char **); +void usage(void); /* * rm -- diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c index 31badbfee8b..e2da117a88e 100644 --- a/bin/rmail/rmail.c +++ b/bin/rmail/rmail.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmail.c,v 1.11 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: rmail.c,v 1.12 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rmail.c 8.3 (Berkeley) 5/15/95"; #else -static char rcsid[] = "$OpenBSD: rmail.c,v 1.11 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: rmail.c,v 1.12 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -89,8 +89,8 @@ static char rcsid[] = "$OpenBSD: rmail.c,v 1.11 2001/09/06 13:29:08 mpech Exp $" extern char *__progname; -void err __P((int, const char *, ...)); -void usage __P((void)); +void err(int, const char *, ...); +void usage(void); #define TAYLOR_ENV /* use UU_MACHINE if present */ diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c index 12e35c5d3b1..2419d03789e 100644 --- a/bin/rmdir/rmdir.c +++ b/bin/rmdir/rmdir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmdir.c,v 1.5 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: rmdir.c,v 1.6 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: rmdir.c,v 1.13 1995/03/21 09:08:31 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: rmdir.c,v 1.5 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: rmdir.c,v 1.6 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -58,8 +58,8 @@ static char rcsid[] = "$OpenBSD: rmdir.c,v 1.5 2001/09/06 13:29:08 mpech Exp $"; extern char *__progname; -int rm_path __P((char *)); -void usage __P((void)); +int rm_path(char *); +void usage(void); int main(argc, argv) diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index c61cb9aadc1..fe79ce24735 100644 --- a/bin/sleep/sleep.c +++ b/bin/sleep/sleep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sleep.c,v 1.11 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: sleep.c,v 1.12 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: sleep.c,v 1.8 1995/03/21 09:11:11 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: sleep.c,v 1.11 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: sleep.c,v 1.12 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -59,8 +59,8 @@ static char rcsid[] = "$OpenBSD: sleep.c,v 1.11 2001/09/06 13:29:08 mpech Exp $" extern char *__progname; -void usage __P((void)); -void alarmh __P((int)); +void usage(void); +void alarmh(int); int main(argc, argv) diff --git a/bin/stty/extern.h b/bin/stty/extern.h index 8e0611a85a6..205353c9c43 100644 --- a/bin/stty/extern.h +++ b/bin/stty/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:08 millert Exp $ */ /* $NetBSD: extern.h,v 1.8 1996/05/07 18:20:06 jtc Exp $ */ /*- @@ -38,16 +38,16 @@ extern char *__progname; -int c_cchars __P((const void *, const void *)); -int c_modes __P((const void *, const void *)); -int csearch __P((char ***, struct info *)); -void checkredirect __P((void)); -void gprint __P((struct termios *, struct winsize *, int)); -void gread __P((struct termios *, char *)); -int ksearch __P((char ***, struct info *)); -int msearch __P((char ***, struct info *)); -void optlist __P((void)); -void print __P((struct termios *, struct winsize *, int, enum FMT)); -void usage __P((void)); +int c_cchars(const void *, const void *); +int c_modes(const void *, const void *); +int csearch(char ***, struct info *); +void checkredirect(void); +void gprint(struct termios *, struct winsize *, int); +void gread(struct termios *, char *); +int ksearch(char ***, struct info *); +int msearch(char ***, struct info *); +void optlist(void); +void print(struct termios *, struct winsize *, int, enum FMT); +void usage(void); extern const struct cchar cchars1[], cchars2[]; diff --git a/bin/stty/key.c b/bin/stty/key.c index a31e3c280a8..23f9dc4e489 100644 --- a/bin/stty/key.c +++ b/bin/stty/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.9 2001/06/25 03:40:25 millert Exp $ */ +/* $OpenBSD: key.c,v 1.10 2002/02/16 21:27:08 millert Exp $ */ /* $NetBSD: key.c,v 1.11 1995/09/07 06:57:11 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)key.c 8.4 (Berkeley) 2/20/95"; #else -static char rcsid[] = "$OpenBSD: key.c,v 1.9 2001/06/25 03:40:25 millert Exp $"; +static char rcsid[] = "$OpenBSD: key.c,v 1.10 2002/02/16 21:27:08 millert Exp $"; #endif #endif /* not lint */ @@ -54,30 +54,30 @@ static char rcsid[] = "$OpenBSD: key.c,v 1.9 2001/06/25 03:40:25 millert Exp $"; #include "extern.h" __BEGIN_DECLS -void f_all __P((struct info *)); -void f_cbreak __P((struct info *)); -void f_columns __P((struct info *)); -void f_dec __P((struct info *)); -void f_ek __P((struct info *)); -void f_everything __P((struct info *)); -void f_extproc __P((struct info *)); -void f_ispeed __P((struct info *)); -void f_lcase __P((struct info *)); -void f_nl __P((struct info *)); -void f_ospeed __P((struct info *)); -void f_raw __P((struct info *)); -void f_rows __P((struct info *)); -void f_sane __P((struct info *)); -void f_size __P((struct info *)); -void f_speed __P((struct info *)); -void f_ostart __P((struct info *)); -void f_ostop __P((struct info *)); -void f_tty __P((struct info *)); +void f_all(struct info *); +void f_cbreak(struct info *); +void f_columns(struct info *); +void f_dec(struct info *); +void f_ek(struct info *); +void f_everything(struct info *); +void f_extproc(struct info *); +void f_ispeed(struct info *); +void f_lcase(struct info *); +void f_nl(struct info *); +void f_ospeed(struct info *); +void f_raw(struct info *); +void f_rows(struct info *); +void f_sane(struct info *); +void f_size(struct info *); +void f_speed(struct info *); +void f_ostart(struct info *); +void f_ostop(struct info *); +void f_tty(struct info *); __END_DECLS static struct key { char *name; /* name */ - void (*f) __P((struct info *)); /* function */ + void (*f)(struct info *); /* function */ #define F_NEEDARG 0x01 /* needs an argument */ #define F_OFFOK 0x02 /* can turn off */ int flags; diff --git a/bin/stty/print.c b/bin/stty/print.c index 15adb22478d..f22b12b291d 100644 --- a/bin/stty/print.c +++ b/bin/stty/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.8 1999/10/26 22:53:52 deraadt Exp $ */ +/* $OpenBSD: print.c,v 1.9 2002/02/16 21:27:08 millert Exp $ */ /* $NetBSD: print.c,v 1.11 1996/05/07 18:20:10 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.8 1999/10/26 22:53:52 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.9 2002/02/16 21:27:08 millert Exp $"; #endif #endif /* not lint */ @@ -51,9 +51,9 @@ static char rcsid[] = "$OpenBSD: print.c,v 1.8 1999/10/26 22:53:52 deraadt Exp $ #include "stty.h" #include "extern.h" -static void binit __P((char *)); -static void bput __P((char *)); -static char *ccval __P((const struct cchar *, int)); +static void binit(char *); +static void bput(char *); +static char *ccval(const struct cchar *, int); void print(tp, wp, ldisc, fmt) |