summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorpho <pho@FreeBSD.org>1999-08-15 19:21:29 +0000
committerpho <pho@FreeBSD.org>1999-08-15 19:21:29 +0000
commitc7316e27a3b4b516d65eba392bb9c5444605a079 (patch)
tree45ef70d0a84c2ecc6999db1d786438bab65b1c36 /lib
parentc1329f8c5d1053e136db443fa15bb36178ade3f9 (diff)
downloadFreeBSD-src-c7316e27a3b4b516d65eba392bb9c5444605a079.zip
FreeBSD-src-c7316e27a3b4b516d65eba392bb9c5444605a079.tar.gz
Reverted to revision 1.8 as previous fix causes fts_open with with a
path name argument with a trailing '/' to fail. Reviewed by: phk
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/gen/fts-compat.c2
-rw-r--r--lib/libc/gen/fts.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/gen/fts-compat.c b/lib/libc/gen/fts-compat.c
index 16d05d9..da88ed1 100644
--- a/lib/libc/gen/fts-compat.c
+++ b/lib/libc/gen/fts-compat.c
@@ -748,7 +748,7 @@ mem1: saved_errno = errno;
* state.
*/
if (ISSET(FTS_NOCHDIR)) {
- if (cp - 1 > sp->fts_path)
+ if (len == sp->fts_pathlen)
--cp;
*cp = '\0';
}
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 16d05d9..da88ed1 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -748,7 +748,7 @@ mem1: saved_errno = errno;
* state.
*/
if (ISSET(FTS_NOCHDIR)) {
- if (cp - 1 > sp->fts_path)
+ if (len == sp->fts_pathlen)
--cp;
*cp = '\0';
}
OpenPOWER on IntegriCloud