diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-01-16 06:39:28 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-01-16 06:39:28 +0000 |
| commit | b9fc9a728fce9c4289b7e9a992665e28d5629a54 (patch) | |
| tree | 72b2433e418dfa1aef5fcf8305617b97979a25d8 /usr.bin/cvs/admin.c | |
| parent | improve checksum parsing slightly. now handles filenames with spaces. (diff) | |
| download | wireguard-openbsd-b9fc9a728fce9c4289b7e9a992665e28d5629a54.tar.xz wireguard-openbsd-b9fc9a728fce9c4289b7e9a992665e28d5629a54.zip | |
Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)
Diffstat (limited to 'usr.bin/cvs/admin.c')
| -rw-r--r-- | usr.bin/cvs/admin.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/cvs/admin.c b/usr.bin/cvs/admin.c index 97269b52b19..6a3120df20b 100644 --- a/usr.bin/cvs/admin.c +++ b/usr.bin/cvs/admin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: admin.c,v 1.64 2008/09/12 13:20:36 tobias Exp $ */ +/* $OpenBSD: admin.c,v 1.65 2015/01/16 06:40:06 deraadt Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005 Joris Vink <joris@openbsd.org> @@ -17,7 +17,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> +#include <sys/types.h> #include <sys/dirent.h> #include <errno.h> @@ -245,7 +245,7 @@ cvs_admin_local(struct cvs_file *cf) struct cvs_file *ocf; struct rcs_access *acp; int ofd; - char *d, *f, fpath[MAXPATHLEN], repo[MAXPATHLEN]; + char *d, *f, fpath[PATH_MAX], repo[PATH_MAX]; if ((f = basename(oldfilename)) == NULL) @@ -253,11 +253,11 @@ cvs_admin_local(struct cvs_file *cf) if ((d = dirname(oldfilename)) == NULL) fatal("cvs_admin_local: dirname failed"); - cvs_get_repository_path(d, repo, MAXPATHLEN); + cvs_get_repository_path(d, repo, PATH_MAX); - (void)xsnprintf(fpath, MAXPATHLEN, "%s/%s", repo, f); + (void)xsnprintf(fpath, PATH_MAX, "%s/%s", repo, f); - if (strlcat(fpath, RCS_FILE_EXT, MAXPATHLEN) >= MAXPATHLEN) + if (strlcat(fpath, RCS_FILE_EXT, PATH_MAX) >= PATH_MAX) fatal("cvs_admin_local: truncation"); if ((ofd = open(fpath, O_RDONLY)) == -1) |