checkpath.c: Move the message buffer into the state structure.

[checkpath] / checkpath.c

diff --git a/checkpath.c b/checkpath.c
index f470d498b2638c63451941b89d9a65fd9cdaef68..2cb73cda2fec3dd09839403ffd76018eb7901ee9 100644 (file)
--- a/checkpath.c
+++ b/checkpath.c
@@ -1,13 +1,11 @@
 /* -*-c-*-
 /* -*-c-*-

- *
- * $Id: checkpath.c,v 1.2 1999/05/18 20:49:12 mdw Exp $

  *
  * Check a path for safety
  *
  * (c) 1999 Mark Wooding
  */
 
  *
  * Check a path for safety
  *
  * (c) 1999 Mark Wooding
  */
 

-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*

  *
  * This file is part of chkpath.
  *
  *
  * This file is part of chkpath.
  *


@@ -15,30 +13,21 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.

- * 
+ *

  * chkpath is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  * chkpath is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.

- * 
+ *

  * You should have received a copy of the GNU General Public License
  * along with chkpath; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
  * You should have received a copy of the GNU General Public License
  * along with chkpath; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 

-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: checkpath.c,v $
- * Revision 1.2  1999/05/18 20:49:12  mdw
- * Use a dynamic string for reading symlinks.
- *
- * Revision 1.1.1.1  1999/04/06 20:12:07  mdw
- * Import new project.
- *
- */
-

 /*----- Header files ------------------------------------------------------*/
 
 /*----- Header files ------------------------------------------------------*/
 

+#include "config.h"
+

 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>


@@ -54,8 +43,10 @@
 
 #include <mLib/alloc.h>
 #include <mLib/dstr.h>
 
 #include <mLib/alloc.h>
 #include <mLib/dstr.h>

+#include <mLib/macros.h>
+#include <mLib/pool.h>

 
 

-#include "path.h"
+#include "checkpath.h"

 
 /*----- Data structures ---------------------------------------------------*/
 
 
 /*----- Data structures ---------------------------------------------------*/
 


@@ -69,28 +60,28 @@ struct elt {
   struct elt *e_link;                  /* Pointer to the next one along */
   size_t e_offset;                     /* Offset of name in path string */
   unsigned e_flags;                    /* Various useful flags */
   struct elt *e_link;                  /* Pointer to the next one along */
   size_t e_offset;                     /* Offset of name in path string */
   unsigned e_flags;                    /* Various useful flags */

+#define EF_STICKY 1u                   /*   Directory has sticky bit set */

   char e_name[1];                      /* Name of the directory */
 };
 
   char e_name[1];                      /* Name of the directory */
 };
 

-enum {
-  f_sticky = 1                         /* Directory has sticky bit set */
-};
-
-enum {
-  f_last = 1                           /* This is the final item to check */
+struct state {
+  pool *p;                             /* Allocation pool */
+  struct elt *sp;                      /* Stack pointer for list */
+  dstr path;                           /* Current path string */
+  dstr link;                           /* Symbolic link target string */
+  dstr msg;                            /* Message string */

 };
 
 /*----- Static variables --------------------------------------------------*/
 
 };
 
 /*----- Static variables --------------------------------------------------*/
 

-static struct elt rootnode = { 0, 0, 0 }; /* Root of the list */
-static struct elt *sp;                 /* Stack pointer for list */
-static dstr d;                         /* Current path string */
+static const struct elt rootnode = { 0, 0, 0 }; /* Root of the list */

 
 /*----- Main code ---------------------------------------------------------*/
 
 /* --- @splitpath@ --- *
  *
 
 /*----- Main code ---------------------------------------------------------*/
 
 /* --- @splitpath@ --- *
  *

- * Arguments:  @const char *path@ = path string to break apart
+ * Arguments:  @struct state *state@ = pointer to state
+ *             @const char *path@ = path string to break apart

  *             @struct elt *tail@ = tail block to attach to end of list
  *
  * Returns:    Pointer to the new list head.
  *             @struct elt *tail@ = tail block to attach to end of list
  *
  * Returns:    Pointer to the new list head.


@@ -100,12 +91,13 @@ static dstr d;                             /* Current path string */
  *             be pushed onto the directory stack as required.
  */
 
  *             be pushed onto the directory stack as required.
  */
 

-static struct elt *splitpath(const char *path, struct elt *tail)
+static struct elt *splitpath(struct state *state,
+                            const char *path, struct elt *tail)

 {
   struct elt *head, **ee = &head, *e;
 {
   struct elt *head, **ee = &head, *e;

+  size_t n;

 
   while (*path) {
 
   while (*path) {

-    size_t n;

 
     /* --- Either a leading `/', or a doubled one --- *
      *
 
     /* --- Either a leading `/', or a doubled one --- *
      *


@@ -123,7 +115,7 @@ static struct elt *splitpath(const char *path, struct elt *tail)
      */
 
     n = strcspn(path, "/");
      */
 
     n = strcspn(path, "/");

-    e = xmalloc(sizeof(struct elt) + n + 1);
+    e = pool_alloc(state->p, offsetof(struct elt, e_name) + n + 1);

     memcpy(e->e_name, path, n);
     e->e_name[n] = 0;
     e->e_flags = 0;
     memcpy(e->e_name, path, n);
     e->e_name[n] = 0;
     e->e_flags = 0;


@@ -140,60 +132,61 @@ static struct elt *splitpath(const char *path, struct elt *tail)
 
 /* --- @pop@ --- *
  *
 
 /* --- @pop@ --- *
  *

- * Arguments:  ---
+ * Arguments:  @struct state *state@ = working state

  *
  * Returns:    ---
  *
  * Use:                Removes the top item from the directory stack.
  */
 
  *
  * Returns:    ---
  *
  * Use:                Removes the top item from the directory stack.
  */
 

-static void pop(void)
+static void pop(struct state *state)

 {
 {

+  struct elt *sp = state->sp, *e;
+

   if (sp->e_link) {
   if (sp->e_link) {

-    struct elt *e = sp->e_link;
-    d.len = sp->e_offset;
-    DPUTZ(&d);
-    sp = e;
+    e = sp->e_link;
+    state->path.len = sp->e_offset;
+    DPUTZ(&state->path);
+    state->sp = e;

   }
 }
 
 /* --- @popall@ --- *
  *
   }
 }
 
 /* --- @popall@ --- *
  *

- * Arguments:  ---
+ * Arguments:  @struct state *state@ = working state

  *
  * Returns:    ---
  *
  * Use:                Removes all the items from the directory stack.
  */
 
  *
  * Returns:    ---
  *
  * Use:                Removes all the items from the directory stack.
  */
 

-static void popall(void)
-{
-  while (sp->e_link)
-    pop();
-}
+static void popall(struct state *state)
+  { state->sp = (/*unconst*/ struct elt *)&rootnode; state->path.len = 0; }

 
 /* --- @push@ --- *
  *
 
 /* --- @push@ --- *
  *

- * Arguments:  @struct elt *e@ = pointer to directory element
+ * Arguments:  @struct state *state@ = working state
+ *             @struct elt *e@ = pointer to directory element

  *
  * Returns:    ---
  *
  * Use:                Pushes a new subdirectory onto the stack.
  */
 
  *
  * Returns:    ---
  *
  * Use:                Pushes a new subdirectory onto the stack.
  */
 

-static void push(struct elt *e)
+static void push(struct state *state, struct elt *e)

 {
 {

-  e->e_link = sp;
-  e->e_offset = d.len;
-  DPUTC(&d, '/');
-  DPUTS(&d, e->e_name);
-  sp = e;
+  e->e_link = state->sp;
+  e->e_offset = state->path.len;
+  DPUTC(&state->path, '/');
+  DPUTS(&state->path, e->e_name);
+  state->sp = e;

 }
 
 /* --- @report@ --- *
  *
 }
 
 /* --- @report@ --- *
  *

- * Arguments:  @struct chkpath *cp@ = pointer to context
- *             @int what@ = what sort of report is this?
+ * Arguments:  @struct state *state@ = pointer to state
+ *             @const struct checkpath *cp@ = pointer to query
+ *             @unsigned what@ = what sort of report is this?

  *             @int verbose@ = how verbose is this?
  *             @const char *p@ = what path does it refer to?
  *             @const char *msg@ = the message to give to the user
  *             @int verbose@ = how verbose is this?
  *             @const char *p@ = what path does it refer to?
  *             @const char *msg@ = the message to give to the user


@@ -203,123 +196,142 @@ static void push(struct elt *e)
  * Use:                Formats and presents messages to the client.
  */
 
  * Use:                Formats and presents messages to the client.
  */
 

-static void report(struct chkpath *cp, int what, int verbose,
+static void report(struct state *state, const struct checkpath *cp,
+                  unsigned what, int verbose,

                   const char *p, const char *msg, ...)
 {
                   const char *p, const char *msg, ...)
 {

+  va_list ap;
+  const char *q = msg;
+  const char *s;
+  size_t n;
+  int e = errno;
+  uid_t u;
+  struct passwd *pw;
+  gid_t g;
+  struct group *gr;
+

   /* --- Decide whether to bin this message --- */
 
   if (!cp->cp_report || verbose > cp->cp_verbose || !(cp->cp_what & what))
     return;
 
   /* --- Decide whether to bin this message --- */
 
   if (!cp->cp_report || verbose > cp->cp_verbose || !(cp->cp_what & what))
     return;
 

+  /* --- If no reporting, do the easy thing --- */
+
+  if (!(cp->cp_what & CP_REPORT)) {
+    cp->cp_report(what, verbose, p, 0, cp->cp_arg);
+    return;
+  }
+

   /* --- Format the message nicely --- */
 
   /* --- Format the message nicely --- */
 

-  if (cp->cp_what & CP_REPORT) {
-    dstr d;
-    va_list ap;
-    const char *q = msg;
-    size_t n;
-    int e = errno;
-
-    dstr_create(&d);
-    va_start(ap, msg);
-    if (verbose > 1)
-      dstr_puts(&d, "[ ");
-    if (p)
-      dstr_putf(&d, "Path: %s: ", p);
-    while (*q) {
-      if (*q == '%') {
-       q++;
-       switch (*q) {
-         case 'e':
-           dstr_puts(&d, strerror(e));
-           break;
-         case 'u': {
-           uid_t u = (uid_t)va_arg(ap, int);
-           struct passwd *pw = getpwuid(u);
-           if (pw)
-             dstr_putf(&d, "`%s'", pw->pw_name);
-           else
-             dstr_putf(&d, "%i", (int)u);
-         } break;
-         case 'g': {
-           gid_t g = (gid_t)va_arg(ap, int);
-           struct group *gr = getgrgid(g);
-           if (gr)
-             dstr_putf(&d, "`%s'", gr->gr_name);
-           else
-             dstr_putf(&d, "%i", (int)g);
-         } break;
-         case 's': {
-           const char *s = va_arg(ap, const char *);
-           dstr_puts(&d, s);
-         } break;
-         case '%':
-           dstr_putc(&d, '%');
-           break;
-         default:
-           dstr_putc(&d, '%');
-           dstr_putc(&d, *q);
-           break;
-       }
-       q++;
-      } else {
-       n = strcspn(q, "%");
-       DPUTM(&d, q, n);
-       q += n;
+  dstr_reset(&state->msg);
+  va_start(ap, msg);
+  if (verbose > 1)
+    dstr_puts(&state->msg, "[ ");
+  if (p)
+    dstr_putf(&state->msg, "Path: %s: ", p);
+  while (*q) {
+    if (*q == '%') {
+      q++;
+      switch (*q) {
+       case 'e':
+         dstr_puts(&state->msg, strerror(e));
+         break;
+       case 'u':
+         u = (uid_t)va_arg(ap, long);
+         if ((pw = getpwuid(u)) != 0)
+           dstr_putf(&state->msg, "`%s'", pw->pw_name);
+         else
+           dstr_putf(&state->msg, "#%ld", (long)u);
+         break;
+       case 'g':
+         g = (gid_t)va_arg(ap, long);
+         if ((gr = getgrgid(g)) != 0)
+           dstr_putf(&state->msg, "`%s'", gr->gr_name);
+         else
+           dstr_putf(&state->msg, "#%ld", (long)g);
+         break;
+       case 's':
+         s = va_arg(ap, const char *);
+         dstr_puts(&state->msg, s);
+         break;
+       case '%':
+         dstr_putc(&state->msg, '%');
+         break;
+       default:
+         dstr_putc(&state->msg, '%');
+         dstr_putc(&state->msg, *q);
+         break;

       }
       }

+      q++;
+    } else {
+      n = strcspn(q, "%");
+      DPUTM(&state->msg, q, n);
+      q += n;

     }
     }

-    if (verbose > 1)
-      dstr_puts(&d, " ]");
-    DPUTZ(&d);
-    cp->cp_report(what, verbose, p, d.buf, cp->cp_arg);
-    dstr_destroy(&d);
-    va_end(ap);
-  } else
-    cp->cp_report(what, verbose, p, 0, cp->cp_arg);
+  }
+  if (verbose > 1)
+    dstr_puts(&state->msg, " ]");
+  DPUTZ(&state->msg);
+  cp->cp_report(what, verbose, p, state->msg.buf, cp->cp_arg);
+  va_end(ap);

 }
 
 /* --- @sanity@ --- *
  *
  * Arguments:  @const char *p@ = name of directory to check
  *             @struct stat *st@ = pointer to @stat@(2) block for it
 }
 
 /* --- @sanity@ --- *
  *
  * Arguments:  @const char *p@ = name of directory to check
  *             @struct stat *st@ = pointer to @stat@(2) block for it

- *             @struct chkpath *cp@ = pointer to caller parameters
- *             @unsigned f@ = various flags
+ *             @struct state *state@ = pointer to state
+ *             @const struct checkpath *cp@ = pointer to query
+ *             @unsigned f@ = various flags (@SF_...@)

  *
  * Returns:    Zero if everything's OK, else bitmask of problems.
  *
  * Use:                Performs the main load of sanity-checking on a directory.
  *
  * Returns:    Zero if everything's OK, else bitmask of problems.
  *
  * Use:                Performs the main load of sanity-checking on a directory.

+ *             If @SF_LAST@ is not set then sticky directories are always
+ *             acceptable.

  */
 
  */
 

-static int sanity(const char *p, struct stat *st,
-                 struct chkpath *cp, unsigned f)
+#define SF_LAST 1u                     /* This is the final item to check */
+
+static unsigned sanity(const char *p, struct stat *st,
+                      struct state *state, const struct checkpath *cp,
+                      unsigned f)

 {
 {

-  int bad = 0;
-  int sticky = (cp->cp_what & CP_STICKYOK) || !(f & f_last) ? 01000 : 0;
+  unsigned bad = 0;
+  int stickyok = 0;
+  int i;
+  unsigned b;
+
+  if (S_ISDIR(st->st_mode) &&
+      (!(f & SF_LAST) || (cp->cp_what & CP_STICKYOK)))
+    stickyok = S_ISVTX;

 
   /* --- Check for world-writability --- */
 
   if ((cp->cp_what & CP_WRWORLD) &&
 
   /* --- Check for world-writability --- */
 
   if ((cp->cp_what & CP_WRWORLD) &&

-      (st->st_mode & (0002 | sticky)) == 0002) {
+      (st->st_mode & (S_IWOTH | stickyok)) == S_IWOTH) {

     bad |= CP_WRWORLD;
     bad |= CP_WRWORLD;

-    report(cp, CP_WRWORLD, 1, p, "** world writable **");
+    report(state, cp, CP_WRWORLD, 1, p, "** world writable **");

   }
 
   /* --- Check for group-writability --- */
 
   if ((cp->cp_what & (CP_WRGRP | CP_WROTHGRP)) &&
   }
 
   /* --- Check for group-writability --- */
 
   if ((cp->cp_what & (CP_WRGRP | CP_WROTHGRP)) &&

-      (st->st_mode & (0020 | sticky)) == 0020) {
-    if (cp->cp_what & CP_WRGRP) {
-      bad |= CP_WRGRP;
-      report(cp, CP_WRGRP, 1, p, "writable by group %g", st->st_gid);
-    } else {
-      int i;
+      (st->st_mode & (S_IWGRP | stickyok)) == S_IWGRP) {
+    b = CP_WRGRP;
+
+    if (cp->cp_what & CP_WROTHGRP) {
+      b = CP_WROTHGRP;

       for (i = 0; i < cp->cp_gids; i++) {
        if (st->st_gid == cp->cp_gid[i])
       for (i = 0; i < cp->cp_gids; i++) {
        if (st->st_gid == cp->cp_gid[i])

-         goto good_gid;
+         b = cp->cp_what & CP_WRGRP;

       }
       }

-      bad |= CP_WROTHGRP;
-      report(cp, CP_WROTHGRP, 1, p, "writable by group %g", st->st_gid);
-    good_gid:;
+    }
+    if (b) {
+      bad |= b;
+      report(state, cp, b, 1, p, "writable by %sgroup %g",
+            (b == CP_WROTHGRP) ? "other " : "", (long)st->st_gid);

     }
   }
 
     }
   }
 


@@ -329,7 +341,8 @@ static int sanity(const char *p, struct stat *st,
       st->st_uid != cp->cp_uid &&
       st->st_uid != 0) {
     bad |= CP_WROTHUSR;
       st->st_uid != cp->cp_uid &&
       st->st_uid != 0) {
     bad |= CP_WROTHUSR;

-    report(cp, CP_WROTHUSR, 1, p, "owner is user %u", st->st_uid);
+    report(state, cp, CP_WROTHUSR, 1, p,
+          "owner is user %u", (long)st->st_uid);

   }
 
   /* --- Done sanity check --- */
   }
 
   /* --- Done sanity check --- */


@@ -337,10 +350,10 @@ static int sanity(const char *p, struct stat *st,
   return (bad);
 }
 
   return (bad);
 }
 

-/* --- @path_check@ --- *
+/* --- @checkpath@ --- *

  *
  * Arguments:  @const char *p@ = directory name which needs checking
  *
  * Arguments:  @const char *p@ = directory name which needs checking

- *             @struct chkpath *cp@ = caller parameters for the check
+ *             @const struct checkpath *cp@ = parameters for the check

  *
  * Returns:    Zero if all is well, otherwise bitmask of problems.
  *
  *
  * Returns:    Zero if all is well, otherwise bitmask of problems.
  *


@@ -348,40 +361,48 @@ static int sanity(const char *p, struct stat *st,
  *             users could do to it.
  */
 
  *             users could do to it.
  */
 

-int path_check(const char *p, struct chkpath *cp)
+unsigned checkpath(const char *p, const struct checkpath *cp)

 {
   char cwd[PATH_MAX];
   struct elt *e, *ee;
 {
   char cwd[PATH_MAX];
   struct elt *e, *ee;

+  struct state *state;
+  pool *pp;

   struct stat st;
   struct stat st;

-  int bad = 0;
+  unsigned bad = 0;
+  int i;

 
 

-  /* --- Initialise stack pointer and path string --- */
+  /* --- Initialize the state --- */

 
 

-  sp = &rootnode;
-  dstr_destroy(&d);
+  pp = pool_create(arena_global);
+  state = pool_alloc(pp, sizeof(*state));
+  state->p = pp;
+  state->sp = (/*unconst*/ struct elt *)&rootnode;
+  dstr_create(&state->path);
+  dstr_create(&state->link);
+  dstr_create(&state->msg);

 
   /* --- Try to find the current directory --- */
 
   if (!getcwd(cwd, sizeof(cwd))) {
 
   /* --- Try to find the current directory --- */
 
   if (!getcwd(cwd, sizeof(cwd))) {

-    report(cp, CP_ERROR, 0, 0, "can't find current directory: %e");
+    report(state, cp, CP_ERROR, 0, 0, "can't find current directory: %e");

     return (CP_ERROR);
   }
 
   /* --- Check that the root directory is OK --- */
 
   if (stat("/", &st)) {
     return (CP_ERROR);
   }
 
   /* --- Check that the root directory is OK --- */
 
   if (stat("/", &st)) {

-    report(cp, CP_ERROR, 0, 0, "can't stat root directory: %e");
+    report(state, cp, CP_ERROR, 0, 0, "can't stat root directory: %e");

     return (CP_ERROR);
   }
 
     return (CP_ERROR);
   }
 

-  report(cp, CP_REPORT, 3, p, "begin scan");
-  bad |= sanity("/", &st, cp, 0);
+  report(state, cp, CP_REPORT, 3, p, "begin scan");
+  bad |= sanity("/", &st, state, cp, 0);

 
   /* --- Get the initial list of things to process --- */
 
 
   /* --- Get the initial list of things to process --- */
 

-  ee = splitpath(p, 0);
+  ee = splitpath(state, p, 0);

   if (*p != '/')
   if (*p != '/')

-    ee = splitpath(cwd, ee);
+    ee = splitpath(state, cwd, ee);

 
   /* --- While there are list items which still need doing --- */
 
 
   /* --- While there are list items which still need doing --- */
 


@@ -391,7 +412,6 @@ int path_check(const char *p, struct chkpath *cp)
     /* --- Strip off simple `.' elements --- */
 
     if (strcmp(ee->e_name, ".") == 0) {
     /* --- Strip off simple `.' elements --- */
 
     if (strcmp(ee->e_name, ".") == 0) {

-      free(ee);

       ee = e;
       continue;
     }
       ee = e;
       continue;
     }


@@ -399,21 +419,20 @@ int path_check(const char *p, struct chkpath *cp)
     /* --- Backtrack on `..' elements --- */
 
     else if (strcmp(ee->e_name, "..") == 0) {
     /* --- Backtrack on `..' elements --- */
 
     else if (strcmp(ee->e_name, "..") == 0) {

-      pop();
-      free(ee);
+      pop(state);

       ee = e;
       continue;
     }
 
     /* --- Everything else gets pushed on the end --- */
 
       ee = e;
       continue;
     }
 
     /* --- Everything else gets pushed on the end --- */
 

-    push(ee);
+    push(state, ee);

     ee = e;
 
     /* --- Find out what sort of a thing this is --- */
 
     ee = e;
 
     /* --- Find out what sort of a thing this is --- */
 

-    if (lstat(d.buf, &st)) {
-      report(cp, CP_ERROR, 0, d.buf, "can't stat: %e");
+    if (lstat(state->path.buf, &st)) {
+      report(state, cp, CP_ERROR, 0, state->path.buf, "can't stat: %e");

       bad |= CP_ERROR;
       break;
     }
       bad |= CP_ERROR;
       break;
     }


@@ -421,20 +440,21 @@ int path_check(const char *p, struct chkpath *cp)
     /* --- Handle symbolic links specially --- */
 
     if (S_ISLNK(st.st_mode)) {
     /* --- Handle symbolic links specially --- */
 
     if (S_ISLNK(st.st_mode)) {

-      dstr buf;
-      int i;

 
       /* --- Resolve the link --- */
 
 
       /* --- Resolve the link --- */
 

-      dstr_create(&buf);
-      dstr_ensure(&buf, st.st_size + 1);
-      if ((i = readlink(d.buf, buf.buf, buf.sz)) < 0) {
-       report(cp, CP_ERROR, 0, d.buf, "can't readlink: %e");
+      dstr_reset(&state->link);
+      dstr_ensure(&state->link, st.st_size + 1);
+      if ((i = readlink(state->path.buf,
+                       state->link.buf, state->link.sz)) < 0) {
+       report(state, cp, CP_ERROR, 0, state->path.buf,
+              "can't readlink: %e");

        bad |= CP_ERROR;
        break;
       }
        bad |= CP_ERROR;
        break;
       }

-      buf.buf[i] = 0;
-      report(cp, CP_SYMLINK, 2, d.buf, "symlink -> `%s'", buf.buf);
+      state->link.buf[i] = 0;
+      report(state, cp, CP_SYMLINK, 2, state->path.buf,
+            "symlink -> `%s'", state->link.buf);

 
       /* --- Handle sticky parents --- *
        *
 
       /* --- Handle sticky parents --- *
        *


@@ -444,32 +464,31 @@ int path_check(const char *p, struct chkpath *cp)
        */
 
       if ((cp->cp_what & CP_WROTHUSR) &&
        */
 
       if ((cp->cp_what & CP_WROTHUSR) &&

-         (sp->e_link->e_flags & f_sticky) &&
+         (state->sp->e_link->e_flags & EF_STICKY) &&

          st.st_uid != cp->cp_uid && st.st_uid != 0) {
        bad |= CP_WROTHUSR;
          st.st_uid != cp->cp_uid && st.st_uid != 0) {
        bad |= CP_WROTHUSR;

-       report(cp, CP_WROTHUSR, 1, d.buf,
-              "symlink modifiable by user %u", st.st_uid);
+       report(state, cp, CP_WROTHUSR, 1, state->path.buf,
+              "symlink modifiable by user %u", (long)st.st_uid);

       }
 
       /* --- Sort out what to do from here --- */
 
       }
 
       /* --- Sort out what to do from here --- */
 

-      if (buf.buf[0] == '/')
-       popall();
+      if (state->link.buf[0] == '/')
+       popall(state);

       else
       else

-       pop();
-      ee = splitpath(buf.buf, ee);
-      dstr_destroy(&buf);
+       pop(state);
+      ee = splitpath(state, state->link.buf, ee);

       continue;
     }
 
     /* --- Run the sanity check on this path element --- */
 
       continue;
     }
 
     /* --- Run the sanity check on this path element --- */
 

-    bad |= sanity(d.buf, &st, cp, ee ? 0 : f_last);
+    bad |= sanity(state->path.buf, &st, state, cp, ee ? 0 : SF_LAST);

 
     if (S_ISDIR(st.st_mode)) {
 
     if (S_ISDIR(st.st_mode)) {

-      if (st.st_mode & 01000)
-       sp->e_flags |= f_sticky;
-      report(cp, CP_REPORT, 4, d.buf, "directory");
+      if (st.st_mode & S_ISVTX)
+       state->sp->e_flags |= EF_STICKY;
+      report(state, cp, CP_REPORT, 4, state->path.buf, "directory");

       continue;
     }
 
       continue;
     }
 


@@ -482,42 +501,109 @@ int path_check(const char *p, struct chkpath *cp)
 
   if (ee) {
     if (!(bad & CP_ERROR))
 
   if (ee) {
     if (!(bad & CP_ERROR))

-      report(cp, CP_ERROR, 0, 0, "junk left over after reaching leaf");
+      report(state, cp, CP_ERROR, 0, 0, "junk left over after reaching leaf");

     while (ee) {
       e = ee->e_link;
     while (ee) {
       e = ee->e_link;

-      free(ee);

       ee = e;
     }
   }
 
       ee = e;
     }
   }
 

-  popall();
+  dstr_destroy(&state->path);
+  dstr_destroy(&state->link);
+  dstr_destroy(&state->msg);
+  pool_destroy(state->p);

   return (bad);
 }
 
   return (bad);
 }
 

-/* --- @path_setids@ --- *
+/* --- @checkpath_addgid@ --- *

  *
  *

- * Arguments:  @struct chkpath *cp@ = pointer to block to fill in
+ * Arguments:  @struct checkpath *cp@ = pointer to block to fill in
+ *             @gid_t g@ = group id to add

  *
  *

- * Returns:    Zero if OK, else @-1@.
+ * Returns:    Zero if successful, nonzero if the array is full.

  *
  *

- * Use:                Fills in the user ids and things in the structure.
+ * Use:                Adds the group @g@ to the structure.

  */
 
  */
 

-void path_setids(struct chkpath *cp)
+int checkpath_addgid(struct checkpath *cp, gid_t g)

 {
 {

-  int n, i;
-  gid_t g = getgid();
+  int i;

 
 

-  cp->cp_uid = getuid();
-  n = getgroups(sizeof(cp->cp_gid) / sizeof(cp->cp_gid[0]), cp->cp_gid);
-  
-  for (i = 0; i < n; i++) {
+  for (i = 0; i < cp->cp_gids; i++) {

     if (cp->cp_gid[i] == g)
     if (cp->cp_gid[i] == g)

-      goto gid_ok;
+      return (0);
+  }
+  if (cp->cp_gids >= N(cp->cp_gid))
+    return (-1);
+  cp->cp_gid[cp->cp_gids++] = g;
+  return (0);
+}
+
+/* --- @checkpath_setuid@ --- *
+ *
+ * Arguments:  @struct checkpath *cp@ = pointer to block to fill in
+ *
+ * Returns:    ---
+ *
+ * Use:                Fills in the @cp_uid@ slot of the structure with the real uid
+ *             of the current process.
+ */
+
+void checkpath_setuid(struct checkpath *cp) { cp->cp_uid = getuid(); }
+
+/* --- @checkpath_setgid@ --- *
+ *
+ * Arguments:  @struct checkpath *cp@ = pointer to block to fill in
+ *
+ * Returns:    Zero if successful, nonzero if the array is full.
+ *
+ * Use:                Adds the real gid of the current process to the @cp_gid@
+ *             array.
+ */
+
+int checkpath_setgid(struct checkpath *cp)
+  { return (checkpath_addgid(cp, getgid())); }
+
+/* --- @checkpath_setgroups@ --- *
+ *
+ * Arguments:  @struct checkpath *cp@ = pointer to block to fill in
+ *
+ * Returns:    Zero if successful, nonzero if the array is full.
+ *
+ * Use:                Adds the current process's supplementary groups to the
+ *             @cp_gid@ table.
+ */
+
+int checkpath_setgroups(struct checkpath *cp)
+{
+  int i, n;
+  gid_t gg[NGROUPS_MAX];
+
+  n = getgroups(N(gg), gg);
+  for (i = 0; i < n; i++) {
+    if (checkpath_addgid(cp, gg[i]))
+      return (-1);

   }
   }

-  cp->cp_gid[n++] = g;
-gid_ok:
-  cp->cp_gids = n;
+  return (0);
+}
+
+/* --- @checkpath_setids@ --- *
+ *
+ * Arguments:  @struct checkpath *cp@ = pointer to block to fill in
+ *
+ * Returns:    ---
+ *
+ * Use:                Fills in the user ids and things in the structure.  This is
+ *             equivalent to setting @cp_gids = 0@ and then calling
+ *             @_setuid@, @_setgid@ and @_setgroups@.  It can't fail.
+ */
+
+void checkpath_setids(struct checkpath *cp)
+{
+  cp->cp_gids = 0;
+  checkpath_setuid(cp);
+  checkpath_setgid(cp);
+  checkpath_setgroups(cp);

 }
 
 /*----- That's all, folks -------------------------------------------------*/
 }
 
 /*----- That's all, folks -------------------------------------------------*/