[src/trunk]: src/lib/libc/gen Fix 3 bugs:

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3ed52cb6dd1f
branches:  trunk
changeset: 475819:3ed52cb6dd1f
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Thu Aug 26 20:24:59 1999 +0000

description:
Fix 3 bugs:
* When not using FTS_NOCHDIR, fts_accpath == fts_name.  fts_padjust should not
  try to move fts_accpath in this case.
* Previous entries at the same level also need to be adjusted.
* A bug was introduced in rev 1.8 (HI CHRISTOS!!) that caused the maxlen
  comparison to always fail (due to type promotions) when sp->fts_pathlen ==
  cur->fts_pathlen -- thus causing memory stompage.

diffstat:

 lib/libc/gen/__fts13.c |  41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 deletions(-)

diffs (122 lines):

diff -r 333406beb9bf -r 3ed52cb6dd1f lib/libc/gen/__fts13.c
--- a/lib/libc/gen/__fts13.c    Thu Aug 26 19:56:08 1999 +0000
+++ b/lib/libc/gen/__fts13.c    Thu Aug 26 20:24:59 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: __fts13.c,v 1.16 1999/06/10 23:40:53 christos Exp $    */
+/*     $NetBSD: __fts13.c,v 1.17 1999/08/26 20:24:59 mycroft Exp $     */
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)fts.c      8.6 (Berkeley) 8/14/94";
 #else
-__RCSID("$NetBSD: __fts13.c,v 1.16 1999/06/10 23:40:53 christos Exp $");
+__RCSID("$NetBSD: __fts13.c,v 1.17 1999/08/26 20:24:59 mycroft Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -88,7 +88,7 @@
 static void     fts_lfree __P((FTSENT *));
 static void     fts_load __P((FTS *, FTSENT *));
 static size_t   fts_maxarglen __P((char * const *));
-static void     fts_padjust __P((FTS *, void *));
+static void     fts_padjust __P((FTS *, FTSENT *));
 static int      fts_palloc __P((FTS *, size_t));
 static FTSENT  *fts_sort __P((FTS *, FTSENT *, size_t));
 static u_short  fts_stat __P((FTS *, FTSENT *, int));
@@ -601,8 +601,8 @@
        size_t nitems;
        FTSENT *cur, *tail;
        DIR *dirp;
-       void *adjaddr;
-       int cderrno, descend, len, level, maxlen, nlinks, saved_errno;
+       int adjust, cderrno, descend, len, level, nlinks, saved_errno;
+       size_t maxlen;
 #ifdef FTS_WHITEOUT
        int oflag;
 #endif
@@ -686,7 +686,7 @@
         * If not changing directories set a pointer so that can just append
         * each new name into the path.
         */
-       maxlen = sp->fts_pathlen - cur->fts_pathlen - 1;
+       maxlen = sp->fts_pathlen - cur->fts_pathlen;
        len = NAPPEND(cur);
        if (ISSET(FTS_NOCHDIR)) {
                cp = sp->fts_path + len;
@@ -696,7 +696,7 @@
        level = cur->fts_level + 1;
 
        /* Read the directory, attaching each entry to the `link' pointer. */
-       adjaddr = NULL;
+       adjust = 0;
        for (head = tail = NULL, nitems = 0; (dp = readdir(dirp)) != NULL;) {
                size_t dlen;
 
@@ -710,7 +710,7 @@
 #endif
                if ((p = fts_alloc(sp, dp->d_name, dlen)) == NULL)
                        goto mem1;
-               if (dlen > maxlen) {
+               if (dlen + 1 > maxlen) {
                        if (fts_palloc(sp, dlen)) {
                                /*
                                 * No more memory for path or structures.  Save
@@ -727,8 +727,8 @@
                                SET(FTS_STOP);
                                return (NULL);
                        }
-                       adjaddr = sp->fts_path;
-                       maxlen = sp->fts_pathlen - sp->fts_cur->fts_pathlen - 1;
+                       adjust = 1;
+                       maxlen = sp->fts_pathlen - sp->fts_cur->fts_pathlen;
                }
 
                p->fts_pathlen = len + dlen + 1;
@@ -789,8 +789,8 @@
         * If had to realloc the path, adjust the addresses for the rest
         * of the tree.
         */
-       if (adjaddr)
-               fts_padjust(sp, adjaddr);
+       if (adjust)
+               fts_padjust(sp, head);
 
        /*
         * If not changing directories, reset the path back to original
@@ -1018,23 +1018,28 @@
  * already returned.
  */
 static void
-fts_padjust(sp, addr)
+fts_padjust(sp, head)
        FTS *sp;
-       void *addr;
+       FTSENT *head;
 {
        FTSENT *p;
+       char *addr;
 
 #define        ADJUST(p) {                                                     \
-       (p)->fts_accpath =                                              \
-           (char *)addr + ((p)->fts_accpath - (p)->fts_path);          \
+       if ((p)->fts_accpath != (p)->fts_name)                          \
+               (p)->fts_accpath =                                      \
+                   addr + ((p)->fts_accpath - (p)->fts_path);          \
        (p)->fts_path = addr;                                           \
 }
+
+       addr = sp->fts_path;
+
        /* Adjust the current set of children. */
        for (p = sp->fts_child; p; p = p->fts_link)
                ADJUST(p);
 
-       /* Adjust the rest of the tree. */
-       for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) {
+       /* Adjust the rest of the tree, including the current level. */
+       for (p = head; p->fts_level >= FTS_ROOTLEVEL;) {
                ADJUST(p);
                p = p->fts_link ? p->fts_link : p->fts_parent;
        }