diff options
Diffstat (limited to 'usr.bin')
42 files changed, 141 insertions, 387 deletions
diff --git a/usr.bin/cvs/add.c b/usr.bin/cvs/add.c index fc95805e2c7..75460e4b1bd 100644 --- a/usr.bin/cvs/add.c +++ b/usr.bin/cvs/add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: add.c,v 1.36 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: add.c,v 1.37 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> @@ -25,14 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/admin.c b/usr.bin/cvs/admin.c index e56eb406477..61104af0914 100644 --- a/usr.bin/cvs/admin.c +++ b/usr.bin/cvs/admin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: admin.c,v 1.25 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: admin.c,v 1.26 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005 Joris Vink <joris@openbsd.org> @@ -25,15 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c index a0bdc9be7b2..797282ebf69 100644 --- a/usr.bin/cvs/annotate.c +++ b/usr.bin/cvs/annotate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: annotate.c,v 1.26 2005/12/30 16:42:13 xsa Exp $ */ +/* $OpenBSD: annotate.c,v 1.27 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,14 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/buf.c b/usr.bin/cvs/buf.c index f548df669bc..be37ce36b69 100644 --- a/usr.bin/cvs/buf.c +++ b/usr.bin/cvs/buf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.c,v 1.27 2005/12/30 05:28:27 joris Exp $ */ +/* $OpenBSD: buf.c,v 1.28 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,17 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> -#include <sys/stat.h> - -#include <ctype.h> -#include <errno.h> -#include <fcntl.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "buf.h" #include "log.h" diff --git a/usr.bin/cvs/buf.h b/usr.bin/cvs/buf.h index 137590ee453..b721890696a 100644 --- a/usr.bin/cvs/buf.h +++ b/usr.bin/cvs/buf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.h,v 1.6 2005/07/26 20:58:44 moritz Exp $ */ +/* $OpenBSD: buf.h,v 1.7 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -38,9 +38,6 @@ #ifndef BUF_H #define BUF_H -#include <sys/types.h> - - /* flags */ #define BUF_AUTOEXT 1 /* autoextend on append */ diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c index bc24ea5a57f..1b9258706b2 100644 --- a/usr.bin/cvs/checkout.c +++ b/usr.bin/cvs/checkout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: checkout.c,v 1.43 2005/12/30 17:51:01 reyk Exp $ */ +/* $OpenBSD: checkout.c,v 1.44 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,14 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/cmd.c b/usr.bin/cvs/cmd.c index 3146af9dc41..220ed364257 100644 --- a/usr.bin/cvs/cmd.c +++ b/usr.bin/cvs/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.41 2005/12/30 17:51:01 reyk Exp $ */ +/* $OpenBSD: cmd.c,v 1.42 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -24,15 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/queue.h> -#include <sys/time.h> -#include <sys/stat.h> - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index a2b64bfeb78..39aa5b4dea0 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.50 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.51 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,16 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/queue.h> -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "buf.h" #include "cvs.h" diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index 293c2c35507..50c0f38196a 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.89 2005/12/19 17:43:01 xsa Exp $ */ +/* $OpenBSD: cvs.c,v 1.90 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,19 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/stat.h> -#include <sys/types.h> -#include <sys/wait.h> - -#include <ctype.h> -#include <err.h> -#include <errno.h> -#include <pwd.h> -#include <signal.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/date.y b/usr.bin/cvs/date.y index b49c582ad1f..e087c939cc0 100644 --- a/usr.bin/cvs/date.y +++ b/usr.bin/cvs/date.y @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: date.y,v 1.10 2005/10/07 21:47:32 reyk Exp $ */ +/* $OpenBSD: date.y,v 1.11 2006/01/02 08:11:56 xsa Exp $ */ /* ** Originally written by Steven M. Bellovin <smb@research.att.com> while @@ -14,15 +14,7 @@ /* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */ /* SUPPRESS 288 on yyerrlab *//* Label unused */ -#include <sys/types.h> -#include <sys/timeb.h> - -#include <ctype.h> -#include <stdio.h> -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> +#include "includes.h" #include "log.h" #include "cvs.h" diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index d7092561b1c..8c55310f14a 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.74 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.75 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -126,20 +126,7 @@ * 6n words for files of length n. */ -#include <sys/stat.h> - -#include <ctype.h> -#include <dirent.h> -#include <err.h> -#include <errno.h> -#include <fcntl.h> -#include <paths.h> -#include <regex.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "buf.h" #include "cvs.h" diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index 55e755a8525..76d01acd083 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.11 2005/12/30 17:51:01 reyk Exp $ */ +/* $OpenBSD: diff3.c,v 1.12 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -72,17 +72,10 @@ static const char copyright[] = #ifndef lint static const char rcsid[] = - "$OpenBSD: diff3.c,v 1.11 2005/12/30 17:51:01 reyk Exp $"; + "$OpenBSD: diff3.c,v 1.12 2006/01/02 08:11:56 xsa Exp $"; #endif /* not lint */ -#include <sys/queue.h> - -#include <err.h> -#include <ctype.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c index f6f5ba1f982..06d454595f4 100644 --- a/usr.bin/cvs/edit.c +++ b/usr.bin/cvs/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.10 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: edit.c,v 1.11 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,15 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> - -#include <errno.h> -#include <fcntl.h> -#include <libgen.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/entries.c b/usr.bin/cvs/entries.c index 541872b87c3..50527233645 100644 --- a/usr.bin/cvs/entries.c +++ b/usr.bin/cvs/entries.c @@ -1,4 +1,4 @@ -/* $OpenBSD: entries.c,v 1.53 2005/12/10 20:27:45 joris Exp $ */ +/* $OpenBSD: entries.c,v 1.54 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,14 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/fatal.c b/usr.bin/cvs/fatal.c index 9488878ec66..45b4278bac6 100644 --- a/usr.bin/cvs/fatal.c +++ b/usr.bin/cvs/fatal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fatal.c,v 1.4 2005/12/30 01:38:39 joris Exp $ */ +/* $OpenBSD: fatal.c,v 1.5 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -23,8 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <stdarg.h> -#include <stdlib.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index 440d82eba6f..5e2f5718f03 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.133 2005/12/12 21:30:33 joris Exp $ */ +/* $OpenBSD: file.c,v 1.134 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,20 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/queue.h> -#include <sys/stat.h> - -#include <dirent.h> -#include <errno.h> -#include <fcntl.h> -#include <fnmatch.h> -#include <libgen.h> -#include <pwd.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "file.h" diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c index 02ae6739c68..14c1f083b94 100644 --- a/usr.bin/cvs/getlog.c +++ b/usr.bin/cvs/getlog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getlog.c,v 1.50 2005/12/30 16:42:13 xsa Exp $ */ +/* $OpenBSD: getlog.c,v 1.51 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,12 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <errno.h> -#include <paths.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/hist.c b/usr.bin/cvs/hist.c index 475e4471f3a..1bf36d3f050 100644 --- a/usr.bin/cvs/hist.c +++ b/usr.bin/cvs/hist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hist.c,v 1.12 2005/12/10 20:27:45 joris Exp $ */ +/* $OpenBSD: hist.c,v 1.13 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,13 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/stat.h> - -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/history.c b/usr.bin/cvs/history.c index 2698ce28690..70cd9cc315f 100644 --- a/usr.bin/cvs/history.c +++ b/usr.bin/cvs/history.c @@ -1,4 +1,4 @@ -/* $OpenBSD: history.c,v 1.24 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: history.c,v 1.25 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,14 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index 99673c21b41..6b7997d4832 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.34 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: import.c,v 1.35 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -24,14 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/includes.h b/usr.bin/cvs/includes.h new file mode 100644 index 00000000000..26c1dcdf688 --- /dev/null +++ b/usr.bin/cvs/includes.h @@ -0,0 +1,60 @@ +/* $OpenBSD: includes.h,v 1.1 2006/01/02 08:11:56 xsa Exp $ */ +/* + * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef INCLUDES_H +#define INCLUDES_H + +#include <sys/time.h> +#include <sys/timeb.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/param.h> +#include <sys/queue.h> +#include <sys/wait.h> + +#include <ctype.h> +#include <dirent.h> +#include <err.h> +#include <errno.h> +#include <fcntl.h> +#include <fnmatch.h> +#include <libgen.h> +#include <md5.h> +#include <paths.h> +#include <pwd.h> +#include <regex.h> +#include <search.h> +#include <signal.h> +#include <stdarg.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <syslog.h> +#include <time.h> +#include <unistd.h> + +#endif /* INCLUDES_H */ diff --git a/usr.bin/cvs/init.c b/usr.bin/cvs/init.c index e229fd8395d..537dff0ae9d 100644 --- a/usr.bin/cvs/init.c +++ b/usr.bin/cvs/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.19 2005/07/25 12:05:43 xsa Exp $ */ +/* $OpenBSD: init.c,v 1.20 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,15 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/log.c b/usr.bin/cvs/log.c index 86298ff9585..0bbae06108a 100644 --- a/usr.bin/cvs/log.c +++ b/usr.bin/cvs/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.28 2005/12/10 20:27:45 joris Exp $ */ +/* $OpenBSD: log.c,v 1.29 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,14 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <syslog.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/log.h b/usr.bin/cvs/log.h index 7010ae46a10..8a31755c4ec 100644 --- a/usr.bin/cvs/log.h +++ b/usr.bin/cvs/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.13 2005/12/19 18:21:31 xsa Exp $ */ +/* $OpenBSD: log.h,v 1.14 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -27,10 +27,6 @@ #ifndef LOG_H #define LOG_H -#include <sys/types.h> - -#include <stdarg.h> - /* log destinations */ #define LD_STD 0x01 #define LD_SYSLOG 0x02 diff --git a/usr.bin/cvs/logmsg.c b/usr.bin/cvs/logmsg.c index ef41c0abdce..45dcd3721ce 100644 --- a/usr.bin/cvs/logmsg.c +++ b/usr.bin/cvs/logmsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logmsg.c,v 1.26 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: logmsg.c,v 1.27 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,14 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "buf.h" #include "cvs.h" diff --git a/usr.bin/cvs/proto.c b/usr.bin/cvs/proto.c index dc3a1e00302..dc039b94690 100644 --- a/usr.bin/cvs/proto.c +++ b/usr.bin/cvs/proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proto.c,v 1.84 2005/12/30 17:51:01 reyk Exp $ */ +/* $OpenBSD: proto.c,v 1.85 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -41,17 +41,7 @@ * */ -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <libgen.h> -#include <pwd.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index 1fc1ebc7777..cffe9e108e1 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.122 2005/12/30 17:51:01 reyk Exp $ */ +/* $OpenBSD: rcs.c,v 1.123 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,19 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> -#include <sys/stat.h> - -#include <ctype.h> -#include <errno.h> -#include <fcntl.h> -#include <libgen.h> -#include <pwd.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/rcsnum.c b/usr.bin/cvs/rcsnum.c index 555b7ceb113..b921ec92119 100644 --- a/usr.bin/cvs/rcsnum.c +++ b/usr.bin/cvs/rcsnum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsnum.c,v 1.21 2005/12/30 17:51:01 reyk Exp $ */ +/* $OpenBSD: rcsnum.c,v 1.22 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,12 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> - -#include <ctype.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/release.c b/usr.bin/cvs/release.c index 8aa2f11da56..a4f565faec8 100644 --- a/usr.bin/cvs/release.c +++ b/usr.bin/cvs/release.c @@ -1,4 +1,4 @@ -/* $OpenBSD: release.c,v 1.27 2005/12/30 16:42:13 xsa Exp $ */ +/* $OpenBSD: release.c,v 1.28 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. @@ -24,15 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c index d508e121ec0..7f5e2474cc2 100644 --- a/usr.bin/cvs/remove.c +++ b/usr.bin/cvs/remove.c @@ -1,4 +1,4 @@ -/* $OpenBSD: remove.c,v 1.39 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: remove.c,v 1.40 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org> @@ -25,15 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/req.c b/usr.bin/cvs/req.c index e1c3e4b41f6..b24264d26be 100644 --- a/usr.bin/cvs/req.c +++ b/usr.bin/cvs/req.c @@ -1,4 +1,4 @@ -/* $OpenBSD: req.c,v 1.39 2005/12/30 16:47:36 joris Exp $ */ +/* $OpenBSD: req.c,v 1.40 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,17 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <libgen.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "buf.h" #include "cvs.h" diff --git a/usr.bin/cvs/resp.c b/usr.bin/cvs/resp.c index a81af510ced..da56b5f7f2c 100644 --- a/usr.bin/cvs/resp.c +++ b/usr.bin/cvs/resp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: resp.c,v 1.67 2005/12/30 16:47:36 joris Exp $ */ +/* $OpenBSD: resp.c,v 1.68 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,19 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/time.h> - -#include <dirent.h> -#include <errno.h> -#include <fcntl.h> -#include <libgen.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "buf.h" #include "cvs.h" diff --git a/usr.bin/cvs/root.c b/usr.bin/cvs/root.c index d198abafbd7..cc0d04a1583 100644 --- a/usr.bin/cvs/root.c +++ b/usr.bin/cvs/root.c @@ -1,4 +1,4 @@ -/* $OpenBSD: root.c,v 1.27 2005/12/20 16:55:21 xsa Exp $ */ +/* $OpenBSD: root.c,v 1.28 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,15 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> - -#include <err.h> -#include <errno.h> -#include <paths.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/server.c b/usr.bin/cvs/server.c index e5b29854f2a..ba6d7c819a6 100644 --- a/usr.bin/cvs/server.c +++ b/usr.bin/cvs/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.26 2005/12/24 19:07:52 xsa Exp $ */ +/* $OpenBSD: server.c,v 1.27 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,14 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/status.c b/usr.bin/cvs/status.c index 391f47df053..ce84cebab52 100644 --- a/usr.bin/cvs/status.c +++ b/usr.bin/cvs/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.50 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: status.c,v 1.51 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> @@ -25,15 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c index b45a7c0f5d4..c3b94cccfc5 100644 --- a/usr.bin/cvs/tag.c +++ b/usr.bin/cvs/tag.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tag.c,v 1.35 2005/12/30 02:03:28 joris Exp $ */ +/* $OpenBSD: tag.c,v 1.36 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2004 Joris Vink <joris@openbsd.org> @@ -25,12 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 52e4c8d822e..21a29997d83 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.50 2005/12/30 16:42:13 xsa Exp $ */ +/* $OpenBSD: update.c,v 1.51 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,14 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/util.c b/usr.bin/cvs/util.c index b78ac16c898..5eaf61376b8 100644 --- a/usr.bin/cvs/util.c +++ b/usr.bin/cvs/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.65 2006/01/01 05:05:58 joris Exp $ */ +/* $OpenBSD: util.c,v 1.66 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,17 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/wait.h> - -#include <errno.h> -#include <fcntl.h> -#include <md5.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/version.c b/usr.bin/cvs/version.c index a93fd92c1c1..0e3fd1609e6 100644 --- a/usr.bin/cvs/version.c +++ b/usr.bin/cvs/version.c @@ -1,4 +1,4 @@ -/* $OpenBSD: version.c,v 1.18 2005/07/25 12:13:08 xsa Exp $ */ +/* $OpenBSD: version.c,v 1.19 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,13 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/watch.c b/usr.bin/cvs/watch.c index 2d99d7f27e8..f2b97ab7a6e 100644 --- a/usr.bin/cvs/watch.c +++ b/usr.bin/cvs/watch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: watch.c,v 1.10 2005/12/31 13:27:51 xsa Exp $ */ +/* $OpenBSD: watch.c,v 1.11 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> * Copyright (c) 2005 Moritz Jodeit <moritz@openbsd.org> @@ -25,14 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include "includes.h" #include "cvs.h" #include "log.h" diff --git a/usr.bin/cvs/xmalloc.c b/usr.bin/cvs/xmalloc.c index 335ebe847d8..e4182a21d03 100644 --- a/usr.bin/cvs/xmalloc.c +++ b/usr.bin/cvs/xmalloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xmalloc.c,v 1.4 2005/12/30 17:51:01 reyk Exp $ */ +/* $OpenBSD: xmalloc.c,v 1.5 2006/01/02 08:11:56 xsa Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -13,8 +13,7 @@ * called by a name other than "ssh" or "Secure Shell". */ -#include <stdlib.h> -#include <string.h> +#include "includes.h" #include "xmalloc.h" #include "log.h" diff --git a/usr.bin/cvs/zlib.c b/usr.bin/cvs/zlib.c index c01f4db841e..4035abe76c4 100644 --- a/usr.bin/cvs/zlib.c +++ b/usr.bin/cvs/zlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zlib.c,v 1.5 2005/12/21 10:49:29 xsa Exp $ */ +/* $OpenBSD: zlib.c,v 1.6 2006/01/02 08:11:56 xsa Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,10 +24,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> - -#include <stdlib.h> -#include <string.h> +#include "includes.h" #include "log.h" #include "cvs.h" |