checkpath.c: Hoist the `buf' used for link targets for reuse.

[checkpath] / checkpath.c

diff --git a/checkpath.c b/checkpath.c
index 9c1508645e02933188401026947284dbaa064be2..d874246025f69ed4b69fe14259226569304a88fa 100644 (file)
--- a/checkpath.c
+++ b/checkpath.c
@@ -291,12 +291,12 @@ static unsigned sanity(const char *p, struct stat *st,
 
   if (S_ISDIR(st->st_mode) &&
       (!(f & SF_LAST) || (cp->cp_what & CP_STICKYOK)))
-    stickyok = 01000;
+    stickyok = S_ISVTX;
 
   /* --- Check for world-writability --- */
 
   if ((cp->cp_what & CP_WRWORLD) &&
-      (st->st_mode & (0002 | stickyok)) == 0002) {
+      (st->st_mode & (S_IWOTH | stickyok)) == S_IWOTH) {
     bad |= CP_WRWORLD;
     report(cp, CP_WRWORLD, 1, p, "** world writable **");
   }
@@ -304,7 +304,7 @@ static unsigned sanity(const char *p, struct stat *st,
   /* --- Check for group-writability --- */
 
   if ((cp->cp_what & (CP_WRGRP | CP_WROTHGRP)) &&
-      (st->st_mode & (0020 | stickyok)) == 0020) {
+      (st->st_mode & (S_IWGRP | stickyok)) == S_IWGRP) {
     b = CP_WRGRP;
 
     if (cp->cp_what & CP_WROTHGRP) {
@@ -352,6 +352,7 @@ unsigned checkpath(const char *p, const struct checkpath *cp)
   struct elt *e, *ee;
   struct stat st;
   unsigned bad = 0;
+  dstr buf = DSTR_INIT;
 
   /* --- Initialize stack pointer and path string --- */
 
@@ -419,11 +420,11 @@ unsigned checkpath(const char *p, const struct checkpath *cp)
     /* --- Handle symbolic links specially --- */
 
     if (S_ISLNK(st.st_mode)) {
-      dstr buf = DSTR_INIT;
       int i;
 
       /* --- Resolve the link --- */
 
+      dstr_reset(&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");
@@ -455,7 +456,6 @@ unsigned checkpath(const char *p, const struct checkpath *cp)
       else
        pop();
       ee = splitpath(buf.buf, ee);
-      dstr_destroy(&buf);
       continue;
     }
 
@@ -464,7 +464,7 @@ unsigned checkpath(const char *p, const struct checkpath *cp)
     bad |= sanity(d.buf, &st, cp, ee ? 0 : SF_LAST);
 
     if (S_ISDIR(st.st_mode)) {
-      if (st.st_mode & 01000)
+      if (st.st_mode & S_ISVTX)
        sp->e_flags |= EF_STICKY;
       report(cp, CP_REPORT, 4, d.buf, "directory");
       continue;
@@ -488,6 +488,7 @@ unsigned checkpath(const char *p, const struct checkpath *cp)
   }
 
   popall();
+  dstr_destroy(&buf);
   return (bad);
 }