diff options
| author |   mickey <mickey@openbsd.org> | 1997-07-25 18:57:57 +0000 |
|---|---|---|
| committer | mickey <mickey@openbsd.org> | 1997-07-25 18:57:57 +0000 |
| commit | b0c62ffac5bc051d37128cca6f228e66cb829887 (patch) | |
| tree | 124f205f1a8f12dc7820f9c442ad42d93151fed7 | |
| parent | restore traditional "all" keyword option - see lpc(8) (diff) | |
| download | wireguard-openbsd-b0c62ffac5bc051d37128cca6f228e66cb829887.tar.xz wireguard-openbsd-b0c62ffac5bc051d37128cca6f228e66cb829887.zip | |
#if __STDC__ --> #ifdef __STDC__
40 files changed, 300 insertions, 300 deletions
diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c index a35927a8833..cfdf31055a1 100644 --- a/bin/csh/alloc.c +++ b/bin/csh/alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alloc.c,v 1.3 1996/12/14 12:17:40 mickey Exp $ */ +/* $OpenBSD: alloc.c,v 1.4 1997/07/25 18:57:57 mickey Exp $ */ /* $NetBSD: alloc.c,v 1.6 1995/03/21 09:02:23 cgd Exp $ */ /*- @@ -38,14 +38,14 @@ #if 0 static char sccsid[] = "@(#)alloc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: alloc.c,v 1.3 1996/12/14 12:17:40 mickey Exp $"; +static char rcsid[] = "$OpenBSD: alloc.c,v 1.4 1997/07/25 18:57:57 mickey Exp $"; #endif #endif /* not lint */ #include <sys/types.h> #include <unistd.h> #include <stdlib.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 0a974b1e633..b971a1bef77 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.c,v 1.6 1997/07/23 14:36:48 kstailey Exp $ */ +/* $OpenBSD: csh.c,v 1.7 1997/07/25 18:57:59 mickey 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.6 1997/07/23 14:36:48 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: csh.c,v 1.7 1997/07/25 18:57:59 mickey Exp $"; #endif #endif /* not lint */ @@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: csh.c,v 1.6 1997/07/23 14:36:48 kstailey Exp $" #include <locale.h> #include <unistd.h> #include <vis.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/dir.c b/bin/csh/dir.c index 56c199cce5e..c53bb55c9ff 100644 --- a/bin/csh/dir.c +++ b/bin/csh/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.2 1996/06/23 14:19:17 deraadt Exp $ */ +/* $OpenBSD: dir.c,v 1.3 1997/07/25 18:58:00 mickey 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.2 1996/06/23 14:19:17 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.3 1997/07/25 18:58:00 mickey Exp $"; #endif #endif /* not lint */ @@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: dir.c,v 1.2 1996/06/23 14:19:17 deraadt Exp $"; #include <stdlib.h> #include <string.h> #include <unistd.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/dol.c b/bin/csh/dol.c index d472a99f6ed..a50f634d98d 100644 --- a/bin/csh/dol.c +++ b/bin/csh/dol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dol.c,v 1.3 1997/07/23 14:36:49 kstailey Exp $ */ +/* $OpenBSD: dol.c,v 1.4 1997/07/25 18:58:01 mickey 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.3 1997/07/23 14:36:49 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: dol.c,v 1.4 1997/07/25 18:58:01 mickey Exp $"; #endif #endif /* not lint */ @@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: dol.c,v 1.3 1997/07/23 14:36:49 kstailey Exp $" #include <stdlib.h> #include <string.h> #include <unistd.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/err.c b/bin/csh/err.c index 0708850347f..ac470682ad6 100644 --- a/bin/csh/err.c +++ b/bin/csh/err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err.c,v 1.4 1997/07/23 14:36:49 kstailey Exp $ */ +/* $OpenBSD: err.c,v 1.5 1997/07/25 18:58:03 mickey Exp $ */ /* $NetBSD: err.c,v 1.6 1995/03/21 09:02:47 cgd Exp $ */ /*- @@ -38,14 +38,14 @@ #if 0 static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: err.c,v 1.4 1997/07/23 14:36:49 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: err.c,v 1.5 1997/07/25 18:58:03 mickey Exp $"; #endif #endif /* not lint */ #include <sys/types.h> #include <stdlib.h> #include <unistd.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> @@ -293,7 +293,7 @@ static char *errorlist[] = * e.g. in process. */ void -#if __STDC__ +#ifdef __STDC__ seterror(int id, ...) #else seterror(id, va_alist) @@ -305,7 +305,7 @@ seterror(id, va_alist) char berr[BUFSIZ]; va_list va; -#if __STDC__ +#ifdef __STDC__ va_start(va, id); #else va_start(va); @@ -338,7 +338,7 @@ seterror(id, va_alist) * place error unwinds are ever caught. */ void -#if __STDC__ +#ifdef __STDC__ stderror(int id, ...) #else stderror(id, va_alist) @@ -371,7 +371,7 @@ stderror(id, va_alist) /* Old error. */ (void) fprintf(csherr, "%s.\n", seterr); else { -#if __STDC__ +#ifdef __STDC__ va_start(va, id); #else va_start(va); diff --git a/bin/csh/exec.c b/bin/csh/exec.c index 30eefb20f7b..cdd2a95a20a 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.3 1996/11/02 01:00:31 millert Exp $ */ +/* $OpenBSD: exec.c,v 1.4 1997/07/25 18:58:04 mickey 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.3 1996/11/02 01:00:31 millert Exp $"; +static char rcsid[] = "$OpenBSD: exec.c,v 1.4 1997/07/25 18:58:04 mickey Exp $"; #endif #endif /* not lint */ @@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: exec.c,v 1.3 1996/11/02 01:00:31 millert Exp $" #include <stdlib.h> #include <string.h> #include <unistd.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/exp.c b/bin/csh/exp.c index 17e809bccc7..f832d0111b8 100644 --- a/bin/csh/exp.c +++ b/bin/csh/exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exp.c,v 1.2 1996/06/23 14:19:20 deraadt Exp $ */ +/* $OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey 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.2 1996/06/23 14:19:20 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey Exp $"; #endif #endif /* not lint */ @@ -49,7 +49,7 @@ static char rcsid[] = "$OpenBSD: exp.c,v 1.2 1996/06/23 14:19:20 deraadt Exp $"; #ifndef SHORT_STRINGS #include <string.h> #endif /* SHORT_STRINGS */ -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/file.c b/bin/csh/file.c index d91c3173025..3864281000b 100644 --- a/bin/csh/file.c +++ b/bin/csh/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.3 1996/12/04 17:46:07 millert Exp $ */ +/* $OpenBSD: file.c,v 1.4 1997/07/25 18:58:06 mickey 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.3 1996/12/04 17:46:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: file.c,v 1.4 1997/07/25 18:58:06 mickey Exp $"; #endif #endif /* not lint */ @@ -55,7 +55,7 @@ static char rcsid[] = "$OpenBSD: file.c,v 1.3 1996/12/04 17:46:07 millert Exp $" #ifndef SHORT_STRINGS #include <string.h> #endif /* SHORT_STRINGS */ -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/func.c b/bin/csh/func.c index 3f787c87954..7db05f15ba5 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -1,4 +1,4 @@ -/* $OpenBSD: func.c,v 1.5 1997/07/23 14:36:50 kstailey Exp $ */ +/* $OpenBSD: func.c,v 1.6 1997/07/25 18:58:07 mickey 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.5 1997/07/23 14:36:50 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: func.c,v 1.6 1997/07/25 18:58:07 mickey Exp $"; #endif #endif /* not lint */ @@ -49,7 +49,7 @@ static char rcsid[] = "$OpenBSD: func.c,v 1.5 1997/07/23 14:36:50 kstailey Exp $ #include <stdlib.h> #include <string.h> #include <unistd.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/glob.c b/bin/csh/glob.c index b2f7328a1e5..a0765957b19 100644 --- a/bin/csh/glob.c +++ b/bin/csh/glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.c,v 1.3 1997/07/23 14:36:50 kstailey Exp $ */ +/* $OpenBSD: glob.c,v 1.4 1997/07/25 18:58:08 mickey 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.3 1997/07/23 14:36:50 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: glob.c,v 1.4 1997/07/25 18:58:08 mickey Exp $"; #endif #endif /* not lint */ @@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: glob.c,v 1.3 1997/07/23 14:36:50 kstailey Exp $ #include <stdlib.h> #include <string.h> #include <unistd.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/hist.c b/bin/csh/hist.c index b58bba91804..073e5277fad 100644 --- a/bin/csh/hist.c +++ b/bin/csh/hist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hist.c,v 1.2 1996/06/23 14:19:24 deraadt Exp $ */ +/* $OpenBSD: hist.c,v 1.3 1997/07/25 18:58:09 mickey Exp $ */ /* $NetBSD: hist.c,v 1.7 1995/03/21 18:35:44 mycroft Exp $ */ /*- @@ -38,13 +38,13 @@ #if 0 static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: hist.c,v 1.2 1996/06/23 14:19:24 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: hist.c,v 1.3 1997/07/25 18:58:09 mickey Exp $"; #endif #endif /* not lint */ #include <sys/types.h> #include <stdlib.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/init.c b/bin/csh/init.c index b6819e0c0c0..ca60a6b2449 100644 --- a/bin/csh/init.c +++ b/bin/csh/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.2 1996/06/23 14:19:24 deraadt Exp $ */ +/* $OpenBSD: init.c,v 1.3 1997/07/25 18:58:10 mickey Exp $ */ /* $NetBSD: init.c,v 1.6 1995/03/21 09:03:05 cgd Exp $ */ /*- @@ -38,11 +38,11 @@ #if 0 static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: init.c,v 1.2 1996/06/23 14:19:24 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.3 1997/07/25 18:58:10 mickey Exp $"; #endif #endif /* not lint */ -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/lex.c b/bin/csh/lex.c index 9273d67c95f..ae8bb8ddc7f 100644 --- a/bin/csh/lex.c +++ b/bin/csh/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.2 1996/06/23 14:19:25 deraadt Exp $ */ +/* $OpenBSD: lex.c,v 1.3 1997/07/25 18:58:12 mickey 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.2 1996/06/23 14:19:25 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: lex.c,v 1.3 1997/07/25 18:58:12 mickey Exp $"; #endif #endif /* not lint */ @@ -49,7 +49,7 @@ static char rcsid[] = "$OpenBSD: lex.c,v 1.2 1996/06/23 14:19:25 deraadt Exp $"; #include <stdlib.h> #include <string.h> #include <unistd.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/misc.c b/bin/csh/misc.c index 818a9584f7a..815d3c63e59 100644 --- a/bin/csh/misc.c +++ b/bin/csh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.4 1996/11/02 01:00:34 millert Exp $ */ +/* $OpenBSD: misc.c,v 1.5 1997/07/25 18:58:13 mickey Exp $ */ /* $NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $ */ /*- @@ -38,14 +38,14 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.4 1996/11/02 01:00:34 millert Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.5 1997/07/25 18:58:13 mickey Exp $"; #endif #endif /* not lint */ #include <sys/param.h> #include <stdlib.h> #include <unistd.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/parse.c b/bin/csh/parse.c index cc318bd6eb0..9b039456e73 100644 --- a/bin/csh/parse.c +++ b/bin/csh/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.2 1996/06/23 14:19:26 deraadt Exp $ */ +/* $OpenBSD: parse.c,v 1.3 1997/07/25 18:58:14 mickey Exp $ */ /* $NetBSD: parse.c,v 1.6 1995/03/21 09:03:10 cgd Exp $ */ /*- @@ -38,14 +38,14 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: parse.c,v 1.2 1996/06/23 14:19:26 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: parse.c,v 1.3 1997/07/25 18:58:14 mickey Exp $"; #endif #endif /* not lint */ #include <sys/types.h> #include <stdlib.h> #include <string.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/proc.c b/bin/csh/proc.c index ffc18be92c5..b1ea8ec44a1 100644 --- a/bin/csh/proc.c +++ b/bin/csh/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.4 1997/07/23 14:36:51 kstailey Exp $ */ +/* $OpenBSD: proc.c,v 1.5 1997/07/25 18:58:15 mickey 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.4 1997/07/23 14:36:51 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: proc.c,v 1.5 1997/07/25 18:58:15 mickey Exp $"; #endif #endif /* not lint */ @@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: proc.c,v 1.4 1997/07/23 14:36:51 kstailey Exp $ #include <unistd.h> #include <stdlib.h> #include <string.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/sem.c b/bin/csh/sem.c index 614e2dce453..e92294fd8a6 100644 --- a/bin/csh/sem.c +++ b/bin/csh/sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sem.c,v 1.3 1997/07/23 14:36:51 kstailey Exp $ */ +/* $OpenBSD: sem.c,v 1.4 1997/07/25 18:58:16 mickey 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.3 1997/07/23 14:36:51 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: sem.c,v 1.4 1997/07/25 18:58:16 mickey Exp $"; #endif #endif /* not lint */ @@ -50,7 +50,7 @@ static char rcsid[] = "$OpenBSD: sem.c,v 1.3 1997/07/23 14:36:51 kstailey Exp $" #include <stdlib.h> #include <string.h> #include <unistd.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/set.c b/bin/csh/set.c index 536195188ae..47649f55833 100644 --- a/bin/csh/set.c +++ b/bin/csh/set.c @@ -1,4 +1,4 @@ -/* $OpenBSD: set.c,v 1.2 1996/06/23 14:19:30 deraadt Exp $ */ +/* $OpenBSD: set.c,v 1.3 1997/07/25 18:58:17 mickey 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.2 1996/06/23 14:19:30 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: set.c,v 1.3 1997/07/25 18:58:17 mickey Exp $"; #endif #endif /* not lint */ @@ -47,7 +47,7 @@ static char rcsid[] = "$OpenBSD: set.c,v 1.2 1996/06/23 14:19:30 deraadt Exp $"; #ifndef SHORT_STRINGS #include <string.h> #endif /* SHORT_STRINGS */ -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/str.c b/bin/csh/str.c index 001ef9090b4..09efefa53a1 100644 --- a/bin/csh/str.c +++ b/bin/csh/str.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str.c,v 1.3 1997/07/23 14:36:52 kstailey Exp $ */ +/* $OpenBSD: str.c,v 1.4 1997/07/25 18:58:18 mickey Exp $ */ /* $NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: str.c,v 1.3 1997/07/23 14:36:52 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: str.c,v 1.4 1997/07/25 18:58:18 mickey Exp $"; #endif #endif /* not lint */ @@ -50,7 +50,7 @@ static char rcsid[] = "$OpenBSD: str.c,v 1.3 1997/07/23 14:36:52 kstailey Exp $" */ #include <sys/types.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/csh/time.c b/bin/csh/time.c index c70fc4c7fa7..21654933e15 100644 --- a/bin/csh/time.c +++ b/bin/csh/time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: time.c,v 1.3 1996/12/14 12:17:44 mickey Exp $ */ +/* $OpenBSD: time.c,v 1.4 1997/07/25 18:58:19 mickey Exp $ */ /* $NetBSD: time.c,v 1.7 1995/03/21 13:55:25 mycroft Exp $ */ /*- @@ -38,12 +38,12 @@ #if 0 static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: time.c,v 1.3 1996/12/14 12:17:44 mickey Exp $"; +static char rcsid[] = "$OpenBSD: time.c,v 1.4 1997/07/25 18:58:19 mickey Exp $"; #endif #endif /* not lint */ #include <sys/types.h> -#if __STDC__ +#ifdef __STDC__ # include <stdarg.h> #else # include <varargs.h> diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 6eacd0f5cb5..5509d8c6610 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar_io.c,v 1.15 1997/07/23 19:15:53 kstailey Exp $ */ +/* $OpenBSD: ar_io.c,v 1.16 1997/07/25 18:58:21 mickey 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.15 1997/07/23 19:15:53 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: ar_io.c,v 1.16 1997/07/25 18:58:21 mickey Exp $"; #endif #endif /* not lint */ @@ -101,7 +101,7 @@ static void ar_start_gzip __P((int)); * -1 on failure, 0 otherwise */ -#if __STDC__ +#ifdef __STDC__ int ar_open(char *name) #else @@ -308,7 +308,7 @@ ar_open(name) * ar_close() * closes archive device, increments volume number, and prints i/o summary */ -#if __STDC__ +#ifdef __STDC__ void ar_close(void) #else @@ -426,7 +426,7 @@ ar_close() * other side of the pipe from getting a SIGPIPE (pax will stop * reading an archive once a format dependent trailer is detected). */ -#if __STDC__ +#ifdef __STDC__ void ar_drain(void) #else @@ -463,7 +463,7 @@ ar_drain() * 0 if all ready to write, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int ar_set_wr(void) #else @@ -506,7 +506,7 @@ ar_set_wr() * 0 if we can append, -1 otherwise. */ -#if __STDC__ +#ifdef __STDC__ int ar_app_ok(void) #else @@ -535,7 +535,7 @@ ar_app_ok() * Number of bytes in buffer. 0 for end of file, -1 for a read error. */ -#if __STDC__ +#ifdef __STDC__ int ar_read(register char *buf, register int cnt) #else @@ -625,7 +625,7 @@ ar_read(buf, cnt) * error in the archive occured. */ -#if __STDC__ +#ifdef __STDC__ int ar_write(register char *buf, register int bsz) #else @@ -750,7 +750,7 @@ ar_write(buf, bsz) * 0 when ok to try i/o again, -1 otherwise. */ -#if __STDC__ +#ifdef __STDC__ int ar_rdsync(void) #else @@ -841,7 +841,7 @@ ar_rdsync() * partial move (the amount moved is in skipped) */ -#if __STDC__ +#ifdef __STDC__ int ar_fow(off_t sksz, off_t *skipped) #else @@ -907,7 +907,7 @@ ar_fow(sksz, skipped) * 0 if moved the requested distance, -1 on complete failure */ -#if __STDC__ +#ifdef __STDC__ int ar_rev(off_t sksz) #else @@ -1045,7 +1045,7 @@ ar_rev(sksz) * physical block size if ok (ok > 0), -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ static int get_phys(void) #else @@ -1163,7 +1163,7 @@ get_phys() * 0 when ready to continue, -1 when all done */ -#if __STDC__ +#ifdef __STDC__ int ar_next(void) #else diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index ce994dcf4be..cb36d93b822 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar_subs.c,v 1.10 1997/07/24 23:19:17 millert Exp $ */ +/* $OpenBSD: ar_subs.c,v 1.11 1997/07/25 18:58:24 mickey 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.10 1997/07/24 23:19:17 millert Exp $"; +static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.11 1997/07/25 18:58:24 mickey Exp $"; #endif #endif /* not lint */ @@ -79,7 +79,7 @@ u_long flcnt; /* number of files processed */ * (no pattern matches all). */ -#if __STDC__ +#ifdef __STDC__ void list(void) #else @@ -161,7 +161,7 @@ list() * pattern(s) (no patterns extracts all members) */ -#if __STDC__ +#ifdef __STDC__ void extract(void) #else @@ -372,7 +372,7 @@ extract() * previously written archive. */ -#if __STDC__ +#ifdef __STDC__ static void wr_archive(register ARCHD *arcn, int is_app) #else @@ -582,7 +582,7 @@ wr_archive(arcn, is_app) * over write existing files that it creates. */ -#if __STDC__ +#ifdef __STDC__ void append(void) #else @@ -723,7 +723,7 @@ append() * write a new archive */ -#if __STDC__ +#ifdef __STDC__ void archive(void) #else @@ -754,7 +754,7 @@ archive() * (except the files are forced to be under the destination directory). */ -#if __STDC__ +#ifdef __STDC__ void copy(void) #else @@ -1006,7 +1006,7 @@ copy() * the specs for rd_wrbuf() for more details) */ -#if __STDC__ +#ifdef __STDC__ static int next_head(register ARCHD *arcn) #else @@ -1152,7 +1152,7 @@ next_head(arcn) * 0 if archive found -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ static int get_arc(void) #else diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c index de74c3a6a69..f256c2d0826 100644 --- a/bin/pax/buf_subs.c +++ b/bin/pax/buf_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buf_subs.c,v 1.5 1997/07/23 19:15:55 kstailey Exp $ */ +/* $OpenBSD: buf_subs.c,v 1.6 1997/07/25 18:58:25 mickey Exp $ */ /* $NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.5 1997/07/23 19:15:55 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: buf_subs.c,v 1.6 1997/07/25 18:58:25 mickey Exp $"; #endif #endif /* not lint */ @@ -89,7 +89,7 @@ off_t rdcnt; /* # of bytes read on current vol */ * 0 if ok, -1 if the user specified write block size violates pax spec */ -#if __STDC__ +#ifdef __STDC__ int wr_start(void) #else @@ -142,7 +142,7 @@ wr_start() * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int rd_start(void) #else @@ -185,7 +185,7 @@ rd_start() * set up buffer system for copying within the file system */ -#if __STDC__ +#ifdef __STDC__ void cp_start(void) #else @@ -229,7 +229,7 @@ cp_start() * 0 for success, -1 for failure */ -#if __STDC__ +#ifdef __STDC__ int appnd_start(off_t skcnt) #else @@ -334,7 +334,7 @@ appnd_start(skcnt) * 0 on success, and -1 on failure */ -#if __STDC__ +#ifdef __STDC__ int rd_sync(void) #else @@ -407,7 +407,7 @@ rd_sync() * pback space is increased. */ -#if __STDC__ +#ifdef __STDC__ void pback(char *pt, int cnt) #else @@ -430,7 +430,7 @@ pback(pt, cnt) * 0 if ok, -1 failure, and 1 when EOF on the archive volume was detected. */ -#if __STDC__ +#ifdef __STDC__ int rd_skip(off_t skcnt) #else @@ -505,7 +505,7 @@ rd_skip(skcnt) * BE a requirement.... */ -#if __STDC__ +#ifdef __STDC__ void wr_fin(void) #else @@ -531,7 +531,7 @@ wr_fin() * 0 if buffer was filled ok, -1 o.w. (buffer flush failure) */ -#if __STDC__ +#ifdef __STDC__ int wr_rdbuf(register char *out, register int outcnt) #else @@ -574,7 +574,7 @@ wr_rdbuf(out, outcnt) * -1 is a read error */ -#if __STDC__ +#ifdef __STDC__ int rd_wrbuf(register char *in, register int cpcnt) #else @@ -629,7 +629,7 @@ rd_wrbuf(in, cpcnt) * 0 if ok, -1 if there was a buf_flush failure */ -#if __STDC__ +#ifdef __STDC__ int wr_skip(off_t skcnt) #else @@ -673,7 +673,7 @@ wr_skip(skcnt) * 0, but "left" is set to be greater than zero. */ -#if __STDC__ +#ifdef __STDC__ int wr_rdfile(ARCHD *arcn, int ifd, off_t *left) #else @@ -742,7 +742,7 @@ wr_rdfile(arcn, ifd, left) * we return a 0 but "left" is set to be the amount unwritten */ -#if __STDC__ +#ifdef __STDC__ int rd_wrfile(ARCHD *arcn, int ofd, off_t *left) #else @@ -838,7 +838,7 @@ rd_wrfile(arcn, ofd, left) * destination file so we can properly copy files with holes. */ -#if __STDC__ +#ifdef __STDC__ void cp_file(ARCHD *arcn, int fd1, int fd2) #else @@ -927,7 +927,7 @@ cp_file(arcn, fd1, fd2) * 0 when finished (user specified termination in ar_next()). */ -#if __STDC__ +#ifdef __STDC__ int buf_fill(void) #else @@ -977,7 +977,7 @@ buf_fill() * 0 if all is ok, -1 when a write error occurs. */ -#if __STDC__ +#ifdef __STDC__ int buf_flush(register int bufcnt) #else diff --git a/bin/pax/cache.c b/bin/pax/cache.c index d5456b5e229..60301d88d2d 100644 --- a/bin/pax/cache.c +++ b/bin/pax/cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cache.c,v 1.5 1997/06/03 11:03:03 deraadt Exp $ */ +/* $OpenBSD: cache.c,v 1.6 1997/07/25 18:58:27 mickey Exp $ */ /* $NetBSD: cache.c,v 1.4 1995/03/21 09:07:10 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: cache.c,v 1.5 1997/06/03 11:03:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: cache.c,v 1.6 1997/07/25 18:58:27 mickey Exp $"; #endif #endif /* not lint */ @@ -81,7 +81,7 @@ static GIDC **grptb = NULL; /* group name to gid cache */ * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int uidtb_start(void) #else @@ -110,7 +110,7 @@ uidtb_start() * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int gidtb_start(void) #else @@ -139,7 +139,7 @@ gidtb_start() * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int usrtb_start(void) #else @@ -168,7 +168,7 @@ usrtb_start() * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int grptb_start(void) #else @@ -198,7 +198,7 @@ grptb_start() * Pointer to stored name (or a empty string) */ -#if __STDC__ +#ifdef __STDC__ char * name_uid(uid_t uid, int frc) #else @@ -276,7 +276,7 @@ name_uid(uid, frc) * Pointer to stored name (or a empty string) */ -#if __STDC__ +#ifdef __STDC__ char * name_gid(gid_t gid, int frc) #else @@ -353,7 +353,7 @@ name_gid(gid, frc) * the uid (if any) for a user name, or a -1 if no match can be found */ -#if __STDC__ +#ifdef __STDC__ int uid_name(char *name, uid_t *uid) #else @@ -423,7 +423,7 @@ uid_name(name, uid) * the gid (if any) for a group name, or a -1 if no match can be found */ -#if __STDC__ +#ifdef __STDC__ int gid_name(char *name, gid_t *gid) #else diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index 8c4f2555c44..47bf5caa932 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpio.c,v 1.4 1997/07/23 19:15:56 kstailey Exp $ */ +/* $OpenBSD: cpio.c,v 1.5 1997/07/25 18:58:28 mickey 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.4 1997/07/23 19:15:56 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: cpio.c,v 1.5 1997/07/25 18:58:28 mickey Exp $"; #endif #endif /* not lint */ @@ -79,7 +79,7 @@ static int swp_head; /* binary cpio header byte swap */ * 0 if ok -1 otherwise (the return values of lnk_start()) */ -#if __STDC__ +#ifdef __STDC__ int cpio_strd(void) #else @@ -100,7 +100,7 @@ cpio_strd() * 0 if a valid trailer, -1 if not a valid trailer, */ -#if __STDC__ +#ifdef __STDC__ int cpio_trail(register ARCHD *arcn) #else @@ -124,7 +124,7 @@ cpio_trail(arcn) * 0 */ -#if __STDC__ +#ifdef __STDC__ static int com_rd(register ARCHD *arcn) #else @@ -179,7 +179,7 @@ com_rd(arcn) * result of the write of the trailer from the cpio specific write func */ -#if __STDC__ +#ifdef __STDC__ int cpio_endwr(void) #else @@ -207,7 +207,7 @@ cpio_endwr() * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ static int rd_nm(register ARCHD *arcn, int nsz) #else @@ -244,7 +244,7 @@ rd_nm(arcn, nsz) * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ static int rd_ln_nm(register ARCHD *arcn) #else @@ -301,7 +301,7 @@ rd_ln_nm(arcn) * 0 if a valid header, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int cpio_id(char *blk, int size) #else @@ -325,7 +325,7 @@ cpio_id(blk, size) * 0 if a valid header, -1 otherwise. */ -#if __STDC__ +#ifdef __STDC__ int cpio_rd(register ARCHD *arcn, register char *buf) #else @@ -408,7 +408,7 @@ cpio_rd(arcn, buf) * size of trailer header in this format */ -#if __STDC__ +#ifdef __STDC__ off_t cpio_endrd(void) #else @@ -426,7 +426,7 @@ cpio_endrd() * 0 if ok, -1 otherwise (what dev_start() returns) */ -#if __STDC__ +#ifdef __STDC__ int cpio_stwr(void) #else @@ -446,7 +446,7 @@ cpio_stwr() * data to write after the header, -1 if archive write failed */ -#if __STDC__ +#ifdef __STDC__ int cpio_wr(register ARCHD *arcn) #else @@ -582,7 +582,7 @@ cpio_wr(arcn) * 0 if a valid header, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int vcpio_id(char *blk, int size) #else @@ -606,7 +606,7 @@ vcpio_id(blk, size) * 0 if a valid header, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int crc_id(char *blk, int size) #else @@ -629,7 +629,7 @@ crc_id(blk, size) * 0 if ok -1 otherwise (the return values of lnk_start()) */ -#if __STDC__ +#ifdef __STDC__ int crc_strd(void) #else @@ -649,7 +649,7 @@ crc_strd() * 0 if a valid header, -1 otherwise. */ -#if __STDC__ +#ifdef __STDC__ int vcpio_rd(register ARCHD *arcn, register char *buf) #else @@ -755,7 +755,7 @@ vcpio_rd(arcn, buf) * size of trailer header in this format */ -#if __STDC__ +#ifdef __STDC__ off_t vcpio_endrd(void) #else @@ -774,7 +774,7 @@ vcpio_endrd() * 0 if ok, -1 otherwise (what dev_start() returns) */ -#if __STDC__ +#ifdef __STDC__ int crc_stwr(void) #else @@ -795,7 +795,7 @@ crc_stwr() * NO data to write after the header, -1 if archive write failed */ -#if __STDC__ +#ifdef __STDC__ int vcpio_wr(register ARCHD *arcn) #else @@ -958,7 +958,7 @@ vcpio_wr(arcn) * 0 if a valid header, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int bcpio_id(char *blk, int size) #else @@ -993,7 +993,7 @@ bcpio_id(blk, size) * 0 if a valid header, -1 otherwise. */ -#if __STDC__ +#ifdef __STDC__ int bcpio_rd(register ARCHD *arcn, register char *buf) #else @@ -1097,7 +1097,7 @@ bcpio_rd(arcn, buf) * size of trailer header in this format */ -#if __STDC__ +#ifdef __STDC__ off_t bcpio_endrd(void) #else @@ -1120,7 +1120,7 @@ bcpio_endrd() * data to write after the header, -1 if archive write failed */ -#if __STDC__ +#ifdef __STDC__ int bcpio_wr(register ARCHD *arcn) #else diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index d1badb79a1e..ab0b8b85290 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file_subs.c,v 1.11 1997/06/06 16:03:13 millert Exp $ */ +/* $OpenBSD: file_subs.c,v 1.12 1997/07/25 18:58:29 mickey 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.11 1997/06/06 16:03:13 millert Exp $"; +static char rcsid[] = "$OpenBSD: file_subs.c,v 1.12 1997/07/25 18:58:29 mickey Exp $"; #endif #endif /* not lint */ @@ -80,7 +80,7 @@ mk_link __P((register char *,register struct stat *,register char *, int)); * file descriptor or -1 for failure */ -#if __STDC__ +#ifdef __STDC__ int file_creat(register ARCHD *arcn) #else @@ -143,7 +143,7 @@ file_creat(arcn) * 0 for success, -1 for failure */ -#if __STDC__ +#ifdef __STDC__ void file_close(register ARCHD *arcn, int fd) #else @@ -190,7 +190,7 @@ file_close(arcn, fd) * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int lnk_creat(register ARCHD *arcn) #else @@ -230,7 +230,7 @@ lnk_creat(arcn) * 0 if cross_lnk() ok, -1 for fatal flaw (like linking to self). */ -#if __STDC__ +#ifdef __STDC__ int cross_lnk(register ARCHD *arcn) #else @@ -260,7 +260,7 @@ cross_lnk(arcn) * 0 skip it file exists (-k) or may be the same as source file */ -#if __STDC__ +#ifdef __STDC__ int chk_same(register ARCHD *arcn) #else @@ -303,7 +303,7 @@ chk_same(arcn) * allowed option). -1 an error occurred. */ -#if __STDC__ +#ifdef __STDC__ static int mk_link(register char *to, register struct stat *to_sb, register char *from, int ign) @@ -385,7 +385,7 @@ mk_link(to, to_sb, from, ign) * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int node_creat(register ARCHD *arcn) #else @@ -555,7 +555,7 @@ node_creat(arcn) * 1 we found a directory and we were going to create a directory. */ -#if __STDC__ +#ifdef __STDC__ int unlnk_exist(register char *name, register int type) #else @@ -613,7 +613,7 @@ unlnk_exist(name, type) * 0 otherwise */ -#if __STDC__ +#ifdef __STDC__ int chk_path( register char *name, uid_t st_uid, gid_t st_gid) #else @@ -705,7 +705,7 @@ chk_path(name, st_uid, st_gid) * not set request. */ -#if __STDC__ +#ifdef __STDC__ void set_ftime(char *fnm, time_t mtime, time_t atime, int frc) #else @@ -752,7 +752,7 @@ set_ftime(fnm, mtime, atime, frc) * 0 when set, -1 on failure */ -#if __STDC__ +#ifdef __STDC__ int set_ids(char *fnm, uid_t uid, gid_t gid) #else @@ -784,7 +784,7 @@ set_ids(fnm, uid, gid) * 0 when set, -1 on failure */ -#if __STDC__ +#ifdef __STDC__ int set_lids(char *fnm, uid_t uid, gid_t gid) #else @@ -814,7 +814,7 @@ set_lids(fnm, uid, gid) * Set file access mode */ -#if __STDC__ +#ifdef __STDC__ void set_pmode(char *fnm, mode_t mode) #else @@ -878,7 +878,7 @@ set_pmode(fnm, mode) * number of bytes written, -1 on write (or lseek) error. */ -#if __STDC__ +#ifdef __STDC__ int file_write(int fd, char *str, register int cnt, int *rem, int *isempt, int sz, char *name) @@ -971,7 +971,7 @@ file_write(fd, str, cnt, rem, isempt, sz, name) * write the last BYTE with a zero (back up one byte and write a zero). */ -#if __STDC__ +#ifdef __STDC__ void file_flush(int fd, char *fname, int isempt) #else @@ -1010,7 +1010,7 @@ file_flush(fd, fname, isempt) * reset access time (tflag) do so (the times are stored in arcn). */ -#if __STDC__ +#ifdef __STDC__ void rdfile_close(register ARCHD *arcn, register int *fd) #else @@ -1047,7 +1047,7 @@ rdfile_close(arcn, fd) * 0 if was able to calculate the crc, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int set_crc(register ARCHD *arcn, register int fd) #else diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index 2823c5df8eb..1694f6c9893 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftree.c,v 1.6 1997/07/24 23:19:19 millert Exp $ */ +/* $OpenBSD: ftree.c,v 1.7 1997/07/25 18:58:30 mickey 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.6 1997/07/24 23:19:19 millert Exp $"; +static char rcsid[] = "$OpenBSD: ftree.c,v 1.7 1997/07/25 18:58:30 mickey Exp $"; #endif #endif /* not lint */ @@ -95,7 +95,7 @@ static int ftree_arg __P((void)); * 0 if there is at least one valid file arg to process, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int ftree_start(void) #else @@ -154,7 +154,7 @@ ftree_start() * 0 if added to the linked list, -1 if failed */ -#if __STDC__ +#ifdef __STDC__ int ftree_add(register char *str, int chflg) #else @@ -206,7 +206,7 @@ ftree_add(str, chflg) * -n and -d processing. */ -#if __STDC__ +#ifdef __STDC__ void ftree_sel(register ARCHD *arcn) #else @@ -245,7 +245,7 @@ ftree_sel(arcn) * have a selected member (reference count still 0) */ -#if __STDC__ +#ifdef __STDC__ void ftree_chk(void) #else @@ -287,7 +287,7 @@ ftree_chk() * stdin). */ -#if __STDC__ +#ifdef __STDC__ static int ftree_arg(void) #else @@ -366,7 +366,7 @@ ftree_arg() * 0 when contents of arcn have been set with the next file, -1 when done. */ -#if __STDC__ +#ifdef __STDC__ int next_file(register ARCHD *arcn) #else diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c index d6e34bb3fd3..049cba22ff5 100644 --- a/bin/pax/gen_subs.c +++ b/bin/pax/gen_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gen_subs.c,v 1.6 1997/06/18 18:48:25 kstailey Exp $ */ +/* $OpenBSD: gen_subs.c,v 1.7 1997/07/25 18:58:31 mickey Exp $ */ /* $NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: gen_subs.c,v 1.6 1997/06/18 18:48:25 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: gen_subs.c,v 1.7 1997/07/25 18:58:31 mickey Exp $"; #endif #endif /* not lint */ @@ -81,7 +81,7 @@ static char rcsid[] = "$OpenBSD: gen_subs.c,v 1.6 1997/06/18 18:48:25 kstailey E * list the members of an archive in ls format */ -#if __STDC__ +#ifdef __STDC__ void ls_list(register ARCHD *arcn, time_t now, FILE *fp) #else @@ -170,7 +170,7 @@ ls_list(arcn, now, fp) * print a short summary of file to tty. */ -#if __STDC__ +#ifdef __STDC__ void ls_tty(register ARCHD *arcn) #else @@ -214,7 +214,7 @@ ls_tty(arcn) * doing a strncpy(), a strlen(), and then a possible memset()) */ -#if __STDC__ +#ifdef __STDC__ int l_strncpy(register char *dest, register char *src, int len) #else @@ -248,7 +248,7 @@ l_strncpy(dest, src, len) * unsigned long value */ -#if __STDC__ +#ifdef __STDC__ u_long asc_ul(register char *str, int len, register int base) #else @@ -299,7 +299,7 @@ asc_ul(str, len, base) * NOTE: the string created is NOT TERMINATED. */ -#if __STDC__ +#ifdef __STDC__ int ul_asc(u_long val, register char *str, register int len, register int base) #else @@ -362,7 +362,7 @@ ul_asc(val, str, len, base) * u_quad_t value */ -#if __STDC__ +#ifdef __STDC__ u_quad_t asc_uqd(register char *str, int len, register int base) #else @@ -413,7 +413,7 @@ asc_uqd(str, len, base) * NOTE: the string created is NOT TERMINATED. */ -#if __STDC__ +#ifdef __STDC__ int uqd_asc(u_quad_t val, register char *str, register int len, register int base) #else diff --git a/bin/pax/options.c b/bin/pax/options.c index 84a7feaacd5..5f43ff5e861 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.28 1997/07/23 19:15:57 kstailey Exp $ */ +/* $OpenBSD: options.c,v 1.29 1997/07/25 18:58:32 mickey 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.28 1997/07/23 19:15:57 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: options.c,v 1.29 1997/07/25 18:58:32 mickey Exp $"; #endif #endif /* not lint */ @@ -146,7 +146,7 @@ int ford[] = {5, 4, 3, 2, 1, 0, -1 }; * parser */ -#if __STDC__ +#ifdef __STDC__ void options(register int argc, register char **argv) #else @@ -182,7 +182,7 @@ options(argc, argv) * the user specified a legal set of flags. If not, complain and exit */ -#if __STDC__ +#ifdef __STDC__ static void pax_options(register int argc, register char **argv) #else @@ -589,7 +589,7 @@ pax_options(argc, argv) * the user specified a legal set of flags. If not, complain and exit */ -#if __STDC__ +#ifdef __STDC__ static void tar_options(register int argc, register char **argv) #else @@ -908,7 +908,7 @@ mkpath(path) * the user specified a legal set of flags. If not, complain and exit */ -#if __STDC__ +#ifdef __STDC__ static void cpio_options(register int argc, register char **argv) #else @@ -1171,7 +1171,7 @@ cpio_options(argc, argv) * print out those invalid flag sets found to the user */ -#if __STDC__ +#ifdef __STDC__ static void printflg(unsigned int flg) #else @@ -1198,7 +1198,7 @@ printflg(flg) * by the user */ -#if __STDC__ +#ifdef __STDC__ static int c_frmt(const void *a, const void *b) #else @@ -1219,7 +1219,7 @@ c_frmt(a, b) * pointer to next OPLIST entry or NULL (end of list). */ -#if __STDC__ +#ifdef __STDC__ OPLIST * opt_next(void) #else @@ -1240,7 +1240,7 @@ opt_next() * when the format does not support options. */ -#if __STDC__ +#ifdef __STDC__ int bad_opt(void) #else @@ -1271,7 +1271,7 @@ bad_opt() * 0 if format in name=value format, -1 if -o is passed junk */ -#if __STDC__ +#ifdef __STDC__ int opt_add(register char *str) #else @@ -1346,7 +1346,7 @@ opt_add(str) * 0 for an error, a positive value o.w. */ -#if __STDC__ +#ifdef __STDC__ static off_t str_offt(char *val) #else @@ -1421,7 +1421,7 @@ str_offt(val) * 0 */ -#if __STDC__ +#ifdef __STDC__ static int no_op(void) #else @@ -1437,7 +1437,7 @@ no_op() * print the usage summary to the user */ -#if __STDC__ +#ifdef __STDC__ void pax_usage(void) #else @@ -1476,7 +1476,7 @@ pax_usage() * print the usage summary to the user */ -#if __STDC__ +#ifdef __STDC__ void tar_usage(void) #else @@ -1496,7 +1496,7 @@ tar_usage() * print the usage summary to the user */ -#if __STDC__ +#ifdef __STDC__ void cpio_usage(void) #else diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index 87e43ed93ff..ad4bbd9ea84 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pat_rep.c,v 1.9 1997/06/04 00:15:17 millert Exp $ */ +/* $OpenBSD: pat_rep.c,v 1.10 1997/07/25 18:58:34 mickey 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.9 1997/06/04 00:15:17 millert Exp $"; +static char rcsid[] = "$OpenBSD: pat_rep.c,v 1.10 1997/07/25 18:58:34 mickey Exp $"; #endif #endif /* not lint */ @@ -104,7 +104,7 @@ static int resub __P((regex_t *, regmatch_t *, char *, char *, char *)); * the list of replacement patterns; -1 otherwise. */ -#if __STDC__ +#ifdef __STDC__ int rep_add(register char *str) #else @@ -232,7 +232,7 @@ rep_add(str) * 0 if the pattern was added to the list, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int pat_add(char *str, char *chdname) #else @@ -284,7 +284,7 @@ pat_add(str, chdname) * a selected archive member. */ -#if __STDC__ +#ifdef __STDC__ void pat_chk(void) #else @@ -326,7 +326,7 @@ pat_chk() * match, -1 otherwise. */ -#if __STDC__ +#ifdef __STDC__ int pat_sel(register ARCHD *arcn) #else @@ -451,7 +451,7 @@ pat_sel(arcn) * looking for more members) */ -#if __STDC__ +#ifdef __STDC__ int pat_match(register ARCHD *arcn) #else @@ -529,7 +529,7 @@ pat_match(arcn) * Note: *pend may be changed to show where the prefix ends. */ -#if __STDC__ +#ifdef __STDC__ static int fn_match(register char *pattern, register char *string, char **pend) #else @@ -660,7 +660,7 @@ range_match(pattern, test) * 0 continue to process file, 1 skip this file, -1 pax is finished */ -#if __STDC__ +#ifdef __STDC__ int mod_name(register ARCHD *arcn) #else @@ -759,7 +759,7 @@ mod_name(arcn) * 0 process this file, 1 skip this file, -1 we need to exit pax */ -#if __STDC__ +#ifdef __STDC__ static int tty_rename(register ARCHD *arcn) #else @@ -831,7 +831,7 @@ tty_rename(arcn) * 0 if ok, -1 if failure (name too long) */ -#if __STDC__ +#ifdef __STDC__ int set_dest(register ARCHD *arcn, char *dest_dir, int dir_len) #else @@ -866,7 +866,7 @@ set_dest(arcn, dest_dir, dir_len) * 0 if ok, -1 if the final name is too long */ -#if __STDC__ +#ifdef __STDC__ static int fix_path( char *or_name, int *or_len, char *dir_name, int dir_len) #else @@ -938,7 +938,7 @@ fix_path(or_name, or_len, dir_name, dir_len) * ended up empty) */ -#if __STDC__ +#ifdef __STDC__ static int rep_name(char *name, int *nlen, int prnt) #else @@ -1112,7 +1112,7 @@ rep_name(name, nlen, prnt) * -1 if error, or the number of characters added to the destination. */ -#if __STDC__ +#ifdef __STDC__ static int resub(regexp *prog, char *src, char *dest, register char *destend) #else @@ -1170,7 +1170,7 @@ resub(prog, src, dest, destend) * -1 if error, or the number of characters added to the destination. */ -#if __STDC__ +#ifdef __STDC__ static int resub(regex_t *rp, register regmatch_t *pm, char *src, char *dest, register char *destend) diff --git a/bin/pax/pax.c b/bin/pax/pax.c index a47f0976080..47c4966bb1a 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pax.c,v 1.9 1997/07/24 23:19:21 millert Exp $ */ +/* $OpenBSD: pax.c,v 1.10 1997/07/25 18:58:35 mickey 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.9 1997/07/24 23:19:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: pax.c,v 1.10 1997/07/25 18:58:35 mickey Exp $"; #endif #endif /* not lint */ @@ -227,7 +227,7 @@ sigset_t s_mask; /* signal mask for cleanup critical sect */ * Return: 0 if ok, 1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int main(int argc, char **argv) #else @@ -286,7 +286,7 @@ main(argc, argv) * never.... */ -#if __STDC__ +#ifdef __STDC__ void sig_cleanup(int which_sig) #else @@ -319,7 +319,7 @@ sig_cleanup(which_sig) * when dealing with a medium to large sized archives. */ -#if __STDC__ +#ifdef __STDC__ static int gen_init(void) #else diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index 969c1aeeec0..cc54324459b 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sel_subs.c,v 1.5 1997/07/23 19:15:59 kstailey Exp $ */ +/* $OpenBSD: sel_subs.c,v 1.6 1997/07/25 18:58:36 mickey 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.5 1997/07/23 19:15:59 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.6 1997/07/25 18:58:36 mickey Exp $"; #endif #endif /* not lint */ @@ -82,7 +82,7 @@ static GRPT **grptb = NULL; /* group selection table */ * 0 if this archive member should be processed, 1 if it should be skipped */ -#if __STDC__ +#ifdef __STDC__ int sel_chk(register ARCHD *arcn) #else @@ -113,7 +113,7 @@ sel_chk(arcn) * 0 if added ok, -1 otherwise; */ -#if __STDC__ +#ifdef __STDC__ int usr_add(register char *str) #else @@ -192,7 +192,7 @@ usr_add(str) * 0 if this archive member should be processed, 1 if it should be skipped */ -#if __STDC__ +#ifdef __STDC__ static int usr_match(register ARCHD *arcn) #else @@ -226,7 +226,7 @@ usr_match(arcn) * 0 if added ok, -1 otherwise; */ -#if __STDC__ +#ifdef __STDC__ int grp_add(register char *str) #else @@ -305,7 +305,7 @@ grp_add(str) * 0 if this archive member should be processed, 1 if it should be skipped */ -#if __STDC__ +#ifdef __STDC__ static int grp_match(register ARCHD *arcn) #else @@ -361,7 +361,7 @@ grp_match(arcn) * 0 if the time range was added to the list, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int trng_add(register char *str) #else @@ -507,7 +507,7 @@ trng_add(str) * 0 if this archive member should be processed, 1 if it should be skipped */ -#if __STDC__ +#ifdef __STDC__ static int trng_match(register ARCHD *arcn) #else @@ -582,7 +582,7 @@ trng_match(arcn) * 0 if converted ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ static int str_sec(register char *str, time_t *tval) #else diff --git a/bin/pax/tables.c b/bin/pax/tables.c index 2e80c78b2f2..6be18476bcd 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tables.c,v 1.7 1997/07/23 19:16:00 kstailey Exp $ */ +/* $OpenBSD: tables.c,v 1.8 1997/07/25 18:58:37 mickey 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.7 1997/07/23 19:16:00 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: tables.c,v 1.8 1997/07/25 18:58:37 mickey Exp $"; #endif #endif /* not lint */ @@ -109,7 +109,7 @@ static DEVT *chk_dev __P((dev_t, int)); * 0 if created, -1 if failure */ -#if __STDC__ +#ifdef __STDC__ int lnk_start(void) #else @@ -138,7 +138,7 @@ lnk_start() * if found returns 1; if not found returns 0; -1 on error */ -#if __STDC__ +#ifdef __STDC__ int chk_lnk(register ARCHD *arcn) #else @@ -231,7 +231,7 @@ chk_lnk(arcn) * we do not want to accidently point another file at it later on. */ -#if __STDC__ +#ifdef __STDC__ void purg_lnk(register ARCHD *arcn) #else @@ -291,7 +291,7 @@ purg_lnk(arcn) * write phase */ -#if __STDC__ +#ifdef __STDC__ void lnk_end(void) #else @@ -356,7 +356,7 @@ lnk_end() * 0 if the table and file was created ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int ftime_start(void) #else @@ -401,7 +401,7 @@ ftime_start() * -1 on error */ -#if __STDC__ +#ifdef __STDC__ int chk_ftime(register ARCHD *arcn) #else @@ -526,7 +526,7 @@ chk_ftime(arcn) * 0 if successful, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int name_start(void) #else @@ -552,7 +552,7 @@ name_start() * 0 if added, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int add_name(register char *oname, int onamelen, char *nname) #else @@ -628,7 +628,7 @@ add_name(oname, onamelen, nname) * new name (oname is the link to name) */ -#if __STDC__ +#ifdef __STDC__ void sub_name(register char *oname, int *onamelen, size_t onamesize) #else @@ -720,7 +720,7 @@ sub_name(oname, onamelen, onamesize) * 0 if successful, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int dev_start(void) #else @@ -747,7 +747,7 @@ dev_start() * 0 if added ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int add_dev(register ARCHD *arcn) #else @@ -774,7 +774,7 @@ add_dev(arcn) * is returned (indicates an error). */ -#if __STDC__ +#ifdef __STDC__ static DEVT * chk_dev(dev_t dev, int add) #else @@ -839,7 +839,7 @@ chk_dev(dev, add) * 0 if all ok, -1 otherwise. */ -#if __STDC__ +#ifdef __STDC__ int map_dev(register ARCHD *arcn, u_long dev_mask, u_long ino_mask) #else @@ -989,7 +989,7 @@ map_dev(arcn, dev_mask, ino_mask) * 0 is created ok, -1 otherwise. */ -#if __STDC__ +#ifdef __STDC__ int atdir_start(void) #else @@ -1014,7 +1014,7 @@ atdir_start() * entries are for directories READ by pax */ -#if __STDC__ +#ifdef __STDC__ void atdir_end(void) #else @@ -1050,7 +1050,7 @@ atdir_end() * and chained by inode number. This is for directories READ by pax */ -#if __STDC__ +#ifdef __STDC__ void add_atdir(char *fname, dev_t dev, ino_t ino, time_t mtime, time_t atime) #else @@ -1122,7 +1122,7 @@ add_atdir(fname, dev, ino, mtime, atime) * 0 if found, -1 if not found. */ -#if __STDC__ +#ifdef __STDC__ int get_atdir(dev_t dev, ino_t ino, time_t *mtime, time_t *atime) #else @@ -1206,7 +1206,7 @@ get_atdir(dev, ino, mtime, atime) * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int dir_start(void) #else @@ -1246,7 +1246,7 @@ dir_start() * pax spec) */ -#if __STDC__ +#ifdef __STDC__ void add_dir(char *name, int nlen, struct stat *psb, int frc_mode) #else @@ -1296,7 +1296,7 @@ add_dir(name, nlen, psb, frc_mode) * by pax */ -#if __STDC__ +#ifdef __STDC__ void proc_dir(void) #else @@ -1364,7 +1364,7 @@ proc_dir() * the hash value of the string MOD (%) the table size. */ -#if __STDC__ +#ifdef __STDC__ u_int st_hash(char *name, int len, int tabsz) #else diff --git a/bin/pax/tar.c b/bin/pax/tar.c index bb4ecca415b..9e83f8ed883 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tar.c,v 1.10 1997/06/04 00:15:18 millert Exp $ */ +/* $OpenBSD: tar.c,v 1.11 1997/07/25 18:58:38 mickey 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.10 1997/06/04 00:15:18 millert Exp $"; +static char rcsid[] = "$OpenBSD: tar.c,v 1.11 1997/07/25 18:58:38 mickey Exp $"; #endif #endif /* not lint */ @@ -82,7 +82,7 @@ static int tar_nodir; /* do not write dirs under old tar */ * 0 if ok, -1 otherwise (what wr_skip returns) */ -#if __STDC__ +#ifdef __STDC__ int tar_endwr(void) #else @@ -100,7 +100,7 @@ tar_endwr() * size of trailer (2 * BLKMULT) */ -#if __STDC__ +#ifdef __STDC__ off_t tar_endrd(void) #else @@ -122,7 +122,7 @@ tar_endrd() * could never contain a header. */ -#if __STDC__ +#ifdef __STDC__ int tar_trail(register char *buf, register int in_resync, register int *cnt) #else @@ -173,7 +173,7 @@ tar_trail(buf, in_resync, cnt) * 0 if the number fit into the string, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ static int ul_oct(u_long val, register char *str, register int len, int term) #else @@ -237,7 +237,7 @@ ul_oct(val, str, len, term) * 0 if the number fit into the string, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ static int uqd_oct(u_quad_t val, register char *str, register int len, int term) #else @@ -300,7 +300,7 @@ uqd_oct(val, str, len, term) * unsigned long checksum */ -#if __STDC__ +#ifdef __STDC__ static u_long tar_chksm(register char *blk, register int len) #else @@ -348,7 +348,7 @@ tar_chksm(blk, len) * 0 if a tar header, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int tar_id(register char *blk, int size) #else @@ -389,7 +389,7 @@ tar_id(blk, size) * 0 if ok -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int tar_opt(void) #else @@ -431,7 +431,7 @@ tar_opt() * 0 */ -#if __STDC__ +#ifdef __STDC__ int tar_rd(register ARCHD *arcn, register char *buf) #else @@ -564,7 +564,7 @@ tar_rd(arcn, buf) * data to write after the header, -1 if archive write failed */ -#if __STDC__ +#ifdef __STDC__ int tar_wr(register ARCHD *arcn) #else @@ -731,7 +731,7 @@ tar_wr(arcn) * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int ustar_strd(void) #else @@ -751,7 +751,7 @@ ustar_strd() * 0 if ok, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int ustar_stwr(void) #else @@ -772,7 +772,7 @@ ustar_stwr() * 0 if a ustar header, -1 otherwise */ -#if __STDC__ +#ifdef __STDC__ int ustar_id(char *blk, int size) #else @@ -811,7 +811,7 @@ ustar_id(blk, size) * 0 */ -#if __STDC__ +#ifdef __STDC__ int ustar_rd(register ARCHD *arcn, register char *buf) #else @@ -970,7 +970,7 @@ ustar_rd(arcn, buf) * data to write after the header, -1 if archive write failed */ -#if __STDC__ +#ifdef __STDC__ int ustar_wr(register ARCHD *arcn) #else @@ -1158,7 +1158,7 @@ ustar_wr(arcn) * the file name is too long */ -#if __STDC__ +#ifdef __STDC__ static char * name_split(register char *name, register int len) #else diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c index 9de1d6f31b3..d70cd7894c0 100644 --- a/bin/pax/tty_subs.c +++ b/bin/pax/tty_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_subs.c,v 1.4 1997/07/23 19:16:00 kstailey Exp $ */ +/* $OpenBSD: tty_subs.c,v 1.5 1997/07/25 18:58:39 mickey Exp $ */ /* $NetBSD: tty_subs.c,v 1.5 1995/03/21 09:07:52 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: tty_subs.c,v 1.4 1997/07/23 19:16:00 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: tty_subs.c,v 1.5 1997/07/25 18:58:39 mickey Exp $"; #endif #endif /* not lint */ @@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: tty_subs.c,v 1.4 1997/07/23 19:16:00 kstailey E #include <string.h> #include "pax.h" #include "extern.h" -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -78,7 +78,7 @@ static FILE *ttyinf = NULL; /* input pointing at control tty */ * open fails, future ops that require user input will get an EOF */ -#if __STDC__ +#ifdef __STDC__ int tty_init(void) #else @@ -110,7 +110,7 @@ tty_init() * if there is no controlling terminal, just return. */ -#if __STDC__ +#ifdef __STDC__ void tty_prnt(char *fmt, ...) #else @@ -121,7 +121,7 @@ tty_prnt(fmt, va_alist) #endif { va_list ap; -# if __STDC__ +# ifdef __STDC__ va_start(ap, fmt); # else va_start(ap); @@ -141,7 +141,7 @@ tty_prnt(fmt, va_alist) * 0 if data was read, -1 otherwise. */ -#if __STDC__ +#ifdef __STDC__ int tty_read(char *str, int len) #else @@ -171,7 +171,7 @@ tty_read(str, len) * will be non-zero. */ -#if __STDC__ +#ifdef __STDC__ void paxwarn(int set, char *fmt, ...) #else @@ -183,7 +183,7 @@ paxwarn(set, fmt, va_alist) #endif { va_list ap; -# if __STDC__ +# ifdef __STDC__ va_start(ap, fmt); # else va_start(ap); @@ -210,7 +210,7 @@ paxwarn(set, fmt, va_alist) * will be non-zero. */ -#if __STDC__ +#ifdef __STDC__ void syswarn(int set, int errnum, char *fmt, ...) #else @@ -223,7 +223,7 @@ syswarn(set, errnum, fmt, va_alist) #endif { va_list ap; -# if __STDC__ +# ifdef __STDC__ va_start(ap, fmt); # else va_start(ap); diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index 31976418d45..cd48053b3d6 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -1,5 +1,5 @@ /* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */ -/* $OpenBSD: rcp.c,v 1.13 1997/07/23 19:19:33 kstailey Exp $ */ +/* $OpenBSD: rcp.c,v 1.14 1997/07/25 18:58:41 mickey Exp $ */ /* * Copyright (c) 1983, 1990, 1992, 1993 @@ -851,7 +851,7 @@ usage() exit(1); } -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -859,7 +859,7 @@ usage() #ifdef KERBEROS void -#if __STDC__ +#ifdef __STDC__ oldw(const char *fmt, ...) #else oldw(fmt, va_alist) @@ -872,7 +872,7 @@ oldw(fmt, va_alist) if (krb_get_lrealm(realm, 1) != KSUCCESS) return; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); @@ -885,7 +885,7 @@ oldw(fmt, va_alist) #endif void -#if __STDC__ +#ifdef __STDC__ run_err(const char *fmt, ...) #else run_err(fmt, va_alist) @@ -895,7 +895,7 @@ run_err(fmt, va_alist) { static FILE *fp; va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, fmt); #else va_start(ap); diff --git a/bin/sh/error.c b/bin/sh/error.c index 9513437ef38..829e99ebe65 100644 --- a/bin/sh/error.c +++ b/bin/sh/error.c @@ -1,4 +1,4 @@ -/* $OpenBSD: error.c,v 1.3 1996/10/20 00:54:45 millert Exp $ */ +/* $OpenBSD: error.c,v 1.4 1997/07/25 18:58:42 mickey Exp $ */ /* $NetBSD: error.c,v 1.14 1995/05/11 21:28:51 christos Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: error.c,v 1.3 1996/10/20 00:54:45 millert Exp $"; +static char rcsid[] = "$OpenBSD: error.c,v 1.4 1997/07/25 18:58:42 mickey Exp $"; #endif #endif /* not lint */ @@ -149,7 +149,7 @@ exverror(cond, msg, ap) } -#if __STDC__ +#ifdef __STDC__ void error(char *msg, ...) #else @@ -158,11 +158,11 @@ error(va_alist) va_dcl #endif { -#if !__STDC__ +#ifndef __STDC__ char *msg; #endif va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, msg); #else va_start(ap); @@ -173,7 +173,7 @@ error(va_alist) } -#if __STDC__ +#ifdef __STDC__ void exerror(int cond, char *msg, ...) #else @@ -182,12 +182,12 @@ exerror(va_alist) va_dcl #endif { -#if !__STDC__ +#ifndef __STDC__ int cond; char *msg; #endif va_list ap; -#if __STDC__ +#ifdef __STDC__ va_start(ap, msg); #else va_start(ap); diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c index 3ab7df2002d..a702ee682cd 100644 --- a/bin/sh/mknodes.c +++ b/bin/sh/mknodes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mknodes.c,v 1.4 1996/10/20 00:54:54 millert Exp $ */ +/* $OpenBSD: mknodes.c,v 1.5 1997/07/25 18:58:43 mickey Exp $ */ /* $NetBSD: mknodes.c,v 1.11 1995/05/11 21:29:36 christos Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mknodes.c 8.2 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: mknodes.c,v 1.4 1996/10/20 00:54:54 millert Exp $"; +static char rcsid[] = "$OpenBSD: mknodes.c,v 1.5 1997/07/25 18:58:43 mickey Exp $"; #endif #endif /* not lint */ @@ -59,7 +59,7 @@ static char rcsid[] = "$OpenBSD: mknodes.c,v 1.4 1996/10/20 00:54:54 millert Exp #include <stdio.h> #include <stdlib.h> #include <string.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -442,7 +442,7 @@ readline() static void -#if __STDC__ +#ifdef __STDC__ error(const char *msg, ...) #else error(va_alist) @@ -450,7 +450,7 @@ error(va_alist) #endif { va_list va; -#if __STDC__ +#ifdef __STDC__ va_start(va, msg); #else char *msg; diff --git a/bin/sh/output.h b/bin/sh/output.h index be89552710c..f05f1b85cc9 100644 --- a/bin/sh/output.h +++ b/bin/sh/output.h @@ -1,4 +1,4 @@ -/* $OpenBSD: output.h,v 1.2 1996/06/23 14:21:30 deraadt Exp $ */ +/* $OpenBSD: output.h,v 1.3 1997/07/25 18:58:44 mickey Exp $ */ /* $NetBSD: output.h,v 1.11 1995/05/11 21:29:53 christos Exp $ */ /*- @@ -41,7 +41,7 @@ #ifndef OUTPUT_INCL -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> diff --git a/bin/sh/show.c b/bin/sh/show.c index 72815970ca0..896ce455c42 100644 --- a/bin/sh/show.c +++ b/bin/sh/show.c @@ -1,4 +1,4 @@ -/* $OpenBSD: show.c,v 1.3 1996/10/20 00:55:06 millert Exp $ */ +/* $OpenBSD: show.c,v 1.4 1997/07/25 18:58:45 mickey Exp $ */ /* $NetBSD: show.c,v 1.11 1995/05/11 21:30:24 christos Exp $ */ /*- @@ -41,12 +41,12 @@ #if 0 static char sccsid[] = "@(#)show.c 8.3 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: show.c,v 1.3 1996/10/20 00:55:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: show.c,v 1.4 1997/07/25 18:58:45 mickey Exp $"; #endif #endif /* not lint */ #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -306,7 +306,7 @@ trputc(c) #endif void -#if __STDC__ +#ifdef __STDC__ trace(const char *fmt, ...) #else trace(va_alist) @@ -315,7 +315,7 @@ trace(va_alist) { #ifdef DEBUG va_list va; -#if __STDC__ +#ifdef __STDC__ va_start(va, fmt); #else char *fmt; |