Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/getcwd.c,v retrieving revision 1.24.4.3 retrieving revision 1.25 diff -u -p -r1.24.4.3 -r1.25 --- src/lib/libc/gen/getcwd.c 2004/05/12 04:20:34 1.24.4.3 +++ src/lib/libc/gen/getcwd.c 2002/04/16 19:08:43 1.25 @@ -1,4 +1,4 @@ -/* $NetBSD: getcwd.c,v 1.24.4.3 2004/05/12 04:20:34 jmc Exp $ */ +/* $NetBSD: getcwd.c,v 1.25 2002/04/16 19:08:43 groo Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1995 @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95"; #else -__RCSID("$NetBSD: getcwd.c,v 1.24.4.3 2004/05/12 04:20:34 jmc Exp $"); +__RCSID("$NetBSD: getcwd.c,v 1.25 2002/04/16 19:08:43 groo Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -134,7 +134,7 @@ loop: errno = ELOOP; goto err1; } - n = readlink(p, resolved, MAXPATHLEN-1); + n = readlink(p, resolved, MAXPATHLEN); if (n < 0) goto err1; resolved[n] = '\0'; @@ -170,8 +170,7 @@ loop: rootd = 0; if (*wbuf) { - if (strlen(resolved) + strlen(wbuf) + (rootd ? 0 : 1) + 1 > - MAXPATHLEN) { + if (strlen(resolved) + strlen(wbuf) + rootd + 1 > MAXPATHLEN) { errno = ENAMETOOLONG; goto err1; }