diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-16 06:40:24 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-16 06:40:24 +0000 |
| commit | 315054f4737a39489e0a14f3a92bff61f1592832 (patch) | |
| tree | 62bf010653374ce09b6beb4dfa0414a91457233b /usr.bin/cvs/root.c | |
| parent | 79e3d817585ca08a91e30ad14abe43e2ab70295f (diff) | |
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/root.c')
| -rw-r--r-- | usr.bin/cvs/root.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/cvs/root.c b/usr.bin/cvs/root.c index d71b2f66be2..1143ea9f280 100644 --- a/usr.bin/cvs/root.c +++ b/usr.bin/cvs/root.c @@ -1,4 +1,4 @@ -/* $OpenBSD: root.c,v 1.47 2010/10/23 18:36:35 nicm Exp $ */ +/* $OpenBSD: root.c,v 1.48 2015/01/16 06:40:07 deraadt Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -163,7 +163,7 @@ cvsroot_parse(const char *str) struct cvsroot * cvsroot_get(const char *dir) { - char rootpath[MAXPATHLEN], *rootstr, line[128]; + char rootpath[PATH_MAX], *rootstr, line[128]; FILE *fp; if (cvs_rootstr != NULL) @@ -178,7 +178,7 @@ cvsroot_get(const char *dir) return (NULL); } - (void)xsnprintf(rootpath, MAXPATHLEN, "%s/%s", dir, CVS_PATH_ROOTSPEC); + (void)xsnprintf(rootpath, PATH_MAX, "%s/%s", dir, CVS_PATH_ROOTSPEC); if ((fp = fopen(rootpath, "r")) == NULL) { if (errno == ENOENT) { |