diff options
45 files changed, 263 insertions, 215 deletions
diff --git a/usr.bin/cvs/add.c b/usr.bin/cvs/add.c index 8ef66e323c7..30a0ec4767b 100644 --- a/usr.bin/cvs/add.c +++ b/usr.bin/cvs/add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: add.c,v 1.76 2007/02/17 18:23:43 xsa Exp $ */ +/* $OpenBSD: add.c,v 1.77 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> @@ -16,11 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "diff.h" -#include "log.h" #include "remote.h" extern char *__progname; diff --git a/usr.bin/cvs/admin.c b/usr.bin/cvs/admin.c index b172543d823..cadb6f65bc3 100644 --- a/usr.bin/cvs/admin.c +++ b/usr.bin/cvs/admin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: admin.c,v 1.49 2007/02/17 18:23:43 xsa Exp $ */ +/* $OpenBSD: admin.c,v 1.50 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005 Joris Vink <joris@openbsd.org> @@ -17,10 +17,16 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/param.h> +#include <sys/dirent.h> + +#include <errno.h> +#include <fcntl.h> +#include <libgen.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" #include "remote.h" #define ADM_EFLAG 0x01 diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c index 403df550ff7..df80a3f1da6 100644 --- a/usr.bin/cvs/annotate.c +++ b/usr.bin/cvs/annotate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: annotate.c,v 1.36 2007/02/09 03:49:15 joris Exp $ */ +/* $OpenBSD: annotate.c,v 1.37 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> * @@ -15,10 +15,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/param.h> +#include <sys/dirent.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" #include "remote.h" void cvs_annotate_local(struct cvs_file *); diff --git a/usr.bin/cvs/buf.c b/usr.bin/cvs/buf.c index 79ee048e037..a7d316c7ebc 100644 --- a/usr.bin/cvs/buf.c +++ b/usr.bin/cvs/buf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.c,v 1.59 2007/02/21 04:18:45 ray Exp $ */ +/* $OpenBSD: buf.c,v 1.60 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,13 +24,15 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" #include "buf.h" -#include "log.h" -#include "xmalloc.h" -#include "worklist.h" #define BUF_INCR 128 diff --git a/usr.bin/cvs/buf.h b/usr.bin/cvs/buf.h index 483c8b5f696..5a388438fb8 100644 --- a/usr.bin/cvs/buf.h +++ b/usr.bin/cvs/buf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.h,v 1.21 2007/02/21 04:18:45 ray Exp $ */ +/* $OpenBSD: buf.h,v 1.22 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -27,6 +27,8 @@ #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 67ce72616e0..94620c61351 100644 --- a/usr.bin/cvs/checkout.c +++ b/usr.bin/cvs/checkout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: checkout.c,v 1.91 2007/02/18 10:30:45 otto Exp $ */ +/* $OpenBSD: checkout.c,v 1.92 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -15,10 +15,16 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/param.h> +#include <sys/dirent.h> +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" #include "diff.h" #include "remote.h" diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c index e5bab2ac8c5..6334b347c24 100644 --- a/usr.bin/cvs/client.c +++ b/usr.bin/cvs/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.58 2007/02/17 18:23:43 xsa Exp $ */ +/* $OpenBSD: client.c,v 1.59 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -15,11 +15,20 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/param.h> +#include <sys/dirent.h> +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <libgen.h> +#include <limits.h> +#include <pwd.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" -#include "diff.h" #include "remote.h" struct cvs_req cvs_requests[] = { diff --git a/usr.bin/cvs/cmd.c b/usr.bin/cvs/cmd.c index 89c23c86c69..67c602b73ce 100644 --- a/usr.bin/cvs/cmd.c +++ b/usr.bin/cvs/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.56 2007/02/19 11:40:00 otto Exp $ */ +/* $OpenBSD: cmd.c,v 1.57 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -23,11 +23,12 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/param.h> +#include <sys/dirent.h> -#include "includes.h" +#include <string.h> #include "cvs.h" -#include "log.h" extern char *cvs_rootstr; diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 7e0264cbdd3..38ee6925a6a 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.104 2007/02/09 03:49:15 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.105 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -16,11 +16,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" #include "diff.h" -#include "log.h" #include "remote.h" void cvs_commit_local(struct cvs_file *); diff --git a/usr.bin/cvs/compress.c b/usr.bin/cvs/compress.c index 615b8f4a693..215e4d5c204 100644 --- a/usr.bin/cvs/compress.c +++ b/usr.bin/cvs/compress.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compress.c,v 1.5 2006/05/29 17:10:57 pat Exp $ */ +/* $OpenBSD: compress.c,v 1.6 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Patrick Latifi <pat@openbsd.org> * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> @@ -25,9 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <zlib.h> -#include "log.h" #include "cvs.h" #include "compress.h" diff --git a/usr.bin/cvs/config.c b/usr.bin/cvs/config.c index 2436b77f86b..d1e0557f122 100644 --- a/usr.bin/cvs/config.c +++ b/usr.bin/cvs/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.8 2007/02/17 18:23:43 xsa Exp $ */ +/* $OpenBSD: config.c,v 1.9 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -15,12 +15,16 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/param.h> +#include <sys/dirent.h> +#include <sys/resource.h> + +#include <errno.h> +#include <stdlib.h> +#include <string.h> #include "cvs.h" #include "config.h" -#include "diff.h" -#include "log.h" void cvs_parse_configfile(void) diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index 9816851bf79..b0dee94ca4c 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.116 2007/02/17 18:23:43 xsa Exp $ */ +/* $OpenBSD: cvs.c,v 1.117 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -25,12 +25,16 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <ctype.h> +#include <errno.h> +#include <pwd.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "config.h" -#include "log.h" -#include "file.h" #include "remote.h" extern char *__progname; diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h index 02e0b0bb41e..74b2a435724 100644 --- a/usr.bin/cvs/cvs.h +++ b/usr.bin/cvs/cvs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.h,v 1.133 2007/02/19 11:40:00 otto Exp $ */ +/* $OpenBSD: cvs.h,v 1.134 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -27,12 +27,15 @@ #ifndef CVS_H #define CVS_H -#include "rcs.h" -#include "util.h" -#include "xmalloc.h" +#include <signal.h> + +#include "config.h" #include "file.h" -#include "repository.h" +#include "log.h" #include "worklist.h" +#include "repository.h" +#include "util.h" +#include "xmalloc.h" #define CVS_VERSION_MINOR "0" #define CVS_VERSION_MAJOR "1" @@ -391,4 +394,5 @@ int cvs_version(int, char **); int cvs_watch(int, char **); int cvs_watchers(int, char **); + #endif diff --git a/usr.bin/cvs/date.y b/usr.bin/cvs/date.y index bdc0ed1d18b..9d913c6dc18 100644 --- a/usr.bin/cvs/date.y +++ b/usr.bin/cvs/date.y @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: date.y,v 1.15 2007/01/20 06:57:54 ray Exp $ */ +/* $OpenBSD: date.y,v 1.16 2007/02/22 06:42:09 otto Exp $ */ /* ** Originally written by Steven M. Bellovin <smb@research.att.com> while @@ -14,9 +14,11 @@ /* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */ /* SUPPRESS 288 on yyerrlab *//* Label unused */ -#include "includes.h" +#include <sys/timeb.h> + +#include <ctype.h> +#include <string.h> -#include "log.h" #include "cvs.h" #define YEAR_EPOCH 1970 diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 0965e0f86c9..92e6c43db52 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.117 2007/02/09 03:49:15 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.118 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -15,11 +15,14 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" #include "diff.h" -#include "log.h" #include "remote.h" void cvs_diff_local(struct cvs_file *); diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index 1b2c81ede28..5f573c49ddf 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.34 2007/01/31 21:07:35 xsa Exp $ */ +/* $OpenBSD: diff3.c,v 1.35 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -72,13 +72,17 @@ static const char copyright[] = #ifndef lint static const char rcsid[] = - "$OpenBSD: diff3.c,v 1.34 2007/01/31 21:07:35 xsa Exp $"; + "$OpenBSD: diff3.c,v 1.35 2007/02/22 06:42:09 otto Exp $"; #endif /* not lint */ -#include "includes.h" +#include <ctype.h> +#include <errno.h> +#include <fcntl.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" #include "diff.h" /* diff3 - 3-way differential file comparison */ diff --git a/usr.bin/cvs/diff_internals.c b/usr.bin/cvs/diff_internals.c index 4c453d9ebda..930e4fc0057 100644 --- a/usr.bin/cvs/diff_internals.c +++ b/usr.bin/cvs/diff_internals.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff_internals.c,v 1.3 2006/07/07 17:37:17 joris Exp $ */ +/* $OpenBSD: diff_internals.c,v 1.4 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -126,14 +126,17 @@ * 6n words for files of length n. */ -#include "includes.h" +#include <sys/stat.h> + +#include <ctype.h> +#include <errno.h> +#include <regex.h> +#include <stddef.h> +#include <string.h> +#include <unistd.h> -#include "buf.h" #include "cvs.h" #include "diff.h" -#include "log.h" - -#include "xmalloc.h" struct cand { int x; diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c index cd562833976..f60e4b8a874 100644 --- a/usr.bin/cvs/edit.c +++ b/usr.bin/cvs/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.33 2007/02/17 18:23:43 xsa Exp $ */ +/* $OpenBSD: edit.c,v 1.34 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006, 2007 Xavier Santolaria <xsa@openbsd.org> * @@ -15,10 +15,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" #include "remote.h" #define E_COMMIT 0x01 diff --git a/usr.bin/cvs/entries.c b/usr.bin/cvs/entries.c index ba8246020b6..20f10ac8281 100644 --- a/usr.bin/cvs/entries.c +++ b/usr.bin/cvs/entries.c @@ -1,4 +1,4 @@ -/* $OpenBSD: entries.c,v 1.74 2007/02/19 11:40:00 otto Exp $ */ +/* $OpenBSD: entries.c,v 1.75 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -15,10 +15,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <errno.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" #define CVS_ENTRIES_NFIELDS 6 #define CVS_ENTRIES_DELIM '/' diff --git a/usr.bin/cvs/fatal.c b/usr.bin/cvs/fatal.c index 159664d4777..0d112eecd29 100644 --- a/usr.bin/cvs/fatal.c +++ b/usr.bin/cvs/fatal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fatal.c,v 1.8 2006/07/07 17:37:17 joris Exp $ */ +/* $OpenBSD: fatal.c,v 1.9 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -23,10 +23,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <fcntl.h> +#include <stdlib.h> #include "cvs.h" -#include "log.h" #include "remote.h" /* Fatal messages. This function never returns. */ diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index 34144a5ddbc..5816dee1416 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.188 2007/02/21 04:18:45 ray Exp $ */ +/* $OpenBSD: file.c,v 1.189 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -25,13 +25,18 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" - +#include <sys/types.h> #include <sys/mman.h> +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <fnmatch.h> +#include <libgen.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "file.h" -#include "log.h" #define CVS_IGN_STATIC 0x01 /* pattern is static, no need to glob */ diff --git a/usr.bin/cvs/file.h b/usr.bin/cvs/file.h index 6b28c913303..951ddf9b8da 100644 --- a/usr.bin/cvs/file.h +++ b/usr.bin/cvs/file.h @@ -1,4 +1,4 @@ -/* $OpenBSD: file.h,v 1.42 2007/02/13 16:47:48 xsa Exp $ */ +/* $OpenBSD: file.h,v 1.43 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -28,6 +28,11 @@ #ifndef FILE_H #define FILE_H +#include <sys/queue.h> + +#include <dirent.h> +#include <stdio.h> + #include "rcs.h" struct cvs_file { diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c index b42248f1147..fe2571f1338 100644 --- a/usr.bin/cvs/getlog.c +++ b/usr.bin/cvs/getlog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getlog.c,v 1.70 2007/02/09 03:49:15 joris Exp $ */ +/* $OpenBSD: getlog.c,v 1.71 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * Copyright (c) 2006 Joris Vink <joris@openbsd.org> @@ -16,11 +16,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <unistd.h> +#include <string.h> #include "cvs.h" -#include "diff.h" -#include "log.h" #include "remote.h" #define LOG_REVSEP \ diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index de47d7ec882..c15de550ccf 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.71 2007/02/21 04:18:45 ray Exp $ */ +/* $OpenBSD: import.c,v 1.72 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -15,11 +15,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" #include "diff.h" -#include "log.h" #include "remote.h" void cvs_import_local(struct cvs_file *); diff --git a/usr.bin/cvs/includes.h b/usr.bin/cvs/includes.h deleted file mode 100644 index 08552485174..00000000000 --- a/usr.bin/cvs/includes.h +++ /dev/null @@ -1,60 +0,0 @@ -/* $OpenBSD: includes.h,v 1.5 2006/05/28 15:45:31 joris 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/resource.h> -#include <sys/stat.h> -#include <sys/param.h> -#include <sys/queue.h> -#include <sys/wait.h> - -#include <ctype.h> -#include <dirent.h> -#include <errno.h> -#include <fcntl.h> -#include <fnmatch.h> -#include <libgen.h> -#include <md5.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> -#include <zlib.h> - -#endif /* INCLUDES_H */ diff --git a/usr.bin/cvs/init.c b/usr.bin/cvs/init.c index 97983700aca..716ee394abb 100644 --- a/usr.bin/cvs/init.c +++ b/usr.bin/cvs/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.31 2007/02/17 18:23:43 xsa Exp $ */ +/* $OpenBSD: init.c,v 1.32 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -25,11 +25,15 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" #include "init.h" -#include "log.h" #include "remote.h" void cvs_init_local(void); diff --git a/usr.bin/cvs/log.c b/usr.bin/cvs/log.c index 18f89a2fa7e..2ba53072a29 100644 --- a/usr.bin/cvs/log.c +++ b/usr.bin/cvs/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.37 2007/01/31 21:07:35 xsa Exp $ */ +/* $OpenBSD: log.c,v 1.38 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -25,10 +25,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <errno.h> +#include <string.h> #include "cvs.h" -#include "log.h" extern char *__progname; static int send_m = 1; diff --git a/usr.bin/cvs/log.h b/usr.bin/cvs/log.h index 2eef696f164..7c0f1ee8a80 100644 --- a/usr.bin/cvs/log.h +++ b/usr.bin/cvs/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.19 2006/05/27 03:30:31 joris Exp $ */ +/* $OpenBSD: log.h,v 1.20 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -27,6 +27,8 @@ #ifndef LOG_H #define LOG_H +#include <stdarg.h> + /* log priority levels */ #define LP_NOTICE 0 #define LP_ERR 1 diff --git a/usr.bin/cvs/logmsg.c b/usr.bin/cvs/logmsg.c index 567f1afbcda..5af73f47bb0 100644 --- a/usr.bin/cvs/logmsg.c +++ b/usr.bin/cvs/logmsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logmsg.c,v 1.37 2007/01/25 22:49:39 xsa Exp $ */ +/* $OpenBSD: logmsg.c,v 1.38 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2007 Joris Vink <joris@openbsd.org> * @@ -15,12 +15,14 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "file.h" -#include "log.h" -#include "worklist.h" #define CVS_LOGMSG_PREFIX "CVS:" #define CVS_LOGMSG_LINE \ diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index 444ddea941d..b30ed4ef176 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.209 2007/02/19 11:40:00 otto Exp $ */ +/* $OpenBSD: rcs.c,v 1.210 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,15 +24,19 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <ctype.h> +#include <errno.h> +#include <libgen.h> +#include <pwd.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> -#include "buf.h" #include "cvs.h" #include "diff.h" -#include "log.h" #include "rcs.h" -#include "util.h" -#include "xmalloc.h" #define RCS_BUFSIZE 16384 #define RCS_BUFEXTSIZE 8192 diff --git a/usr.bin/cvs/rcsnum.c b/usr.bin/cvs/rcsnum.c index b62c90b806b..1925707fd89 100644 --- a/usr.bin/cvs/rcsnum.c +++ b/usr.bin/cvs/rcsnum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsnum.c,v 1.41 2007/02/21 04:09:54 ray Exp $ */ +/* $OpenBSD: rcsnum.c,v 1.42 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,11 +24,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <ctype.h> +#include <string.h> #include "cvs.h" -#include "log.h" -#include "rcs.h" static void rcsnum_setsize(RCSNUM *, u_int); static char *rcsnum_itoa(u_int16_t, char *, size_t); diff --git a/usr.bin/cvs/remote.c b/usr.bin/cvs/remote.c index 01066ae2f1e..9d5452e0e1c 100644 --- a/usr.bin/cvs/remote.c +++ b/usr.bin/cvs/remote.c @@ -1,4 +1,4 @@ -/* $OpenBSD: remote.c,v 1.13 2007/01/31 21:07:35 xsa Exp $ */ +/* $OpenBSD: remote.c,v 1.14 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -15,11 +15,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" -#include "diff.h" #include "remote.h" struct cvs_resp * diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c index a584ad50a9f..d3ecd10641f 100644 --- a/usr.bin/cvs/remove.c +++ b/usr.bin/cvs/remove.c @@ -1,4 +1,4 @@ -/* $OpenBSD: remove.c,v 1.63 2007/02/09 03:49:15 joris Exp $ */ +/* $OpenBSD: remove.c,v 1.64 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * @@ -15,10 +15,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <errno.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" #include "remote.h" extern char *__progname; diff --git a/usr.bin/cvs/repository.c b/usr.bin/cvs/repository.c index df0a7c064f3..e0773886081 100644 --- a/usr.bin/cvs/repository.c +++ b/usr.bin/cvs/repository.c @@ -1,4 +1,4 @@ -/* $OpenBSD: repository.c,v 1.11 2007/02/17 18:23:43 xsa Exp $ */ +/* $OpenBSD: repository.c,v 1.12 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -15,13 +15,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <pwd.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "file.h" -#include "log.h" -#include "repository.h" -#include "worklist.h" struct cvs_wklhead repo_locks; diff --git a/usr.bin/cvs/root.c b/usr.bin/cvs/root.c index 20b0f51f92f..cf3b38af776 100644 --- a/usr.bin/cvs/root.c +++ b/usr.bin/cvs/root.c @@ -1,4 +1,4 @@ -/* $OpenBSD: root.c,v 1.35 2007/02/07 17:54:42 xsa Exp $ */ +/* $OpenBSD: root.c,v 1.36 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,10 +24,11 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <errno.h> +#include <stdlib.h> +#include <string.h> #include "cvs.h" -#include "log.h" extern char *cvs_rootstr; diff --git a/usr.bin/cvs/server.c b/usr.bin/cvs/server.c index e59dd32b385..01b3a97dcfd 100644 --- a/usr.bin/cvs/server.c +++ b/usr.bin/cvs/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.54 2007/02/17 18:23:43 xsa Exp $ */ +/* $OpenBSD: server.c,v 1.55 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -15,11 +15,16 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <libgen.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" -#include "diff.h" #include "remote.h" struct cvs_resp cvs_responses[] = { diff --git a/usr.bin/cvs/status.c b/usr.bin/cvs/status.c index 88ea2a6b49f..ded805a93d6 100644 --- a/usr.bin/cvs/status.c +++ b/usr.bin/cvs/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.72 2007/02/09 03:49:15 joris Exp $ */ +/* $OpenBSD: status.c,v 1.73 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> @@ -16,10 +16,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" #include "remote.h" void cvs_status_local(struct cvs_file *); diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c index a6d474ec13d..db79702d9f5 100644 --- a/usr.bin/cvs/tag.c +++ b/usr.bin/cvs/tag.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tag.c,v 1.54 2007/02/09 03:49:15 joris Exp $ */ +/* $OpenBSD: tag.c,v 1.55 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> * @@ -15,10 +15,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <unistd.h> #include "cvs.h" -#include "log.h" #include "remote.h" #define T_CHECK_UPTODATE 0x01 diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 7652018183e..1fc08c282f7 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.96 2007/02/17 18:23:43 xsa Exp $ */ +/* $OpenBSD: update.c,v 1.97 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -15,10 +15,14 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <sys/stat.h> + +#include <errno.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" #include "diff.h" #include "remote.h" diff --git a/usr.bin/cvs/util.c b/usr.bin/cvs/util.c index e0a09c9f14d..3848daec7f7 100644 --- a/usr.bin/cvs/util.c +++ b/usr.bin/cvs/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.106 2007/02/19 11:40:00 otto Exp $ */ +/* $OpenBSD: util.c,v 1.107 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org> @@ -26,11 +26,16 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <sys/stat.h> +#include <sys/wait.h> + +#include <errno.h> +#include <md5.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" -#include "util.h" /* letter -> mode type map */ static const int cvs_modetypes[26] = { diff --git a/usr.bin/cvs/version.c b/usr.bin/cvs/version.c index e731847f94c..99bd89045cb 100644 --- a/usr.bin/cvs/version.c +++ b/usr.bin/cvs/version.c @@ -1,4 +1,4 @@ -/* $OpenBSD: version.c,v 1.23 2007/01/11 02:35:55 joris Exp $ */ +/* $OpenBSD: version.c,v 1.24 2007/02/22 06:42:10 otto Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -16,10 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" - #include "cvs.h" -#include "log.h" #include "remote.h" struct cvs_cmd cvs_cmd_version = { diff --git a/usr.bin/cvs/watch.c b/usr.bin/cvs/watch.c index e6ecbee2b4a..dfad04f411f 100644 --- a/usr.bin/cvs/watch.c +++ b/usr.bin/cvs/watch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: watch.c,v 1.16 2007/01/11 02:35:55 joris Exp $ */ +/* $OpenBSD: watch.c,v 1.17 2007/02/22 06:42:10 otto Exp $ */ /* * Copyright (c) 2005-2007 Xavier Santolaria <xsa@openbsd.org> * @@ -15,10 +15,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "includes.h" +#include <string.h> +#include <unistd.h> #include "cvs.h" -#include "log.h" #include "remote.h" #define W_COMMIT 0x01 diff --git a/usr.bin/cvs/worklist.c b/usr.bin/cvs/worklist.c index 52564221f02..0491b054f3a 100644 --- a/usr.bin/cvs/worklist.c +++ b/usr.bin/cvs/worklist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: worklist.c,v 1.5 2006/04/05 01:38:56 ray Exp $ */ +/* $OpenBSD: worklist.c,v 1.6 2007/02/22 06:42:10 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -24,11 +24,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include <string.h> +#include <unistd.h> -#include "log.h" -#include "worklist.h" -#include "xmalloc.h" +#include "cvs.h" /* * adds a path to a worklist. diff --git a/usr.bin/cvs/worklist.h b/usr.bin/cvs/worklist.h index 0a3648ddb47..bba8d9f0d86 100644 --- a/usr.bin/cvs/worklist.h +++ b/usr.bin/cvs/worklist.h @@ -1,4 +1,4 @@ -/* $OpenBSD: worklist.h,v 1.5 2006/05/27 03:30:31 joris Exp $ */ +/* $OpenBSD: worklist.h,v 1.6 2007/02/22 06:42:10 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -27,6 +27,8 @@ #ifndef WORKLIST_H #define WORKLIST_H +#include <sys/param.h> + struct cvs_worklist { char wkl_path[MAXPATHLEN]; volatile SLIST_ENTRY(cvs_worklist) wkl_list; diff --git a/usr.bin/cvs/xmalloc.c b/usr.bin/cvs/xmalloc.c index 9883da91ef9..0a778cadbb7 100644 --- a/usr.bin/cvs/xmalloc.c +++ b/usr.bin/cvs/xmalloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xmalloc.c,v 1.7 2007/01/29 16:22:29 xsa Exp $ */ +/* $OpenBSD: xmalloc.c,v 1.8 2007/02/22 06:42:10 otto Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -13,10 +13,13 @@ * called by a name other than "ssh" or "Secure Shell". */ -#include "includes.h" +#include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> -#include "xmalloc.h" #include "log.h" +#include "xmalloc.h" void * xmalloc(size_t size) |