summaryrefslogtreecommitdiff
path: root/bin/csh
diff options
context:
space:
mode:
Diffstat (limited to 'bin/csh')
-rw-r--r--bin/csh/csh.c24
-rw-r--r--bin/csh/csh.h4
-rw-r--r--bin/csh/dir.c16
-rw-r--r--bin/csh/dol.c26
-rw-r--r--bin/csh/exec.c16
-rw-r--r--bin/csh/exp.c34
-rw-r--r--bin/csh/extern.h398
-rw-r--r--bin/csh/file.c44
-rw-r--r--bin/csh/func.c36
-rw-r--r--bin/csh/glob.c22
-rw-r--r--bin/csh/hist.c10
-rw-r--r--bin/csh/lex.c32
-rw-r--r--bin/csh/misc.c6
-rw-r--r--bin/csh/parse.c24
-rw-r--r--bin/csh/printf.c22
-rw-r--r--bin/csh/proc.c24
-rw-r--r--bin/csh/sem.c12
-rw-r--r--bin/csh/set.c24
-rw-r--r--bin/csh/time.c6
19 files changed, 390 insertions, 390 deletions
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()