debian/control: Replace obsolete ${Source-Version} substitution.

[checkpath] / tmpdir.c

diff --git a/tmpdir.c b/tmpdir.c
index b14f6d668bc3bc6c743c7e97833ac6ae4f8d73d4..0bf51d3a9c0551aaf2acd210271886cd31e1a138 100644 (file)
--- a/tmpdir.c
+++ b/tmpdir.c
@@ -69,6 +69,17 @@ static struct passwd *pw;
  *             and @*f@ is set, then try to create the directory.
  */
 
  *             and @*f@ is set, then try to create the directory.
  */
 

+static void complain(const char *p, const char *msg, int err)
+{
+  dstr d = DSTR_INIT;
+
+  if (!cp.cp_verbose) return;
+  dstr_putf(&d, "Path: %s: %s", p, msg);
+  if (err) dstr_putf(&d, ": %s", strerror(err));
+  moan(d.buf);
+  dstr_destroy(&d);
+}
+

 static int ok(const char *p, int *f)
 {
   struct stat st;
 static int ok(const char *p, int *f)
 {
   struct stat st;


@@ -79,9 +90,12 @@ static int ok(const char *p, int *f)
 
     /* --- Maybe create it if it doesn't exist --- */
 
 
     /* --- Maybe create it if it doesn't exist --- */
 

-    if (errno != ENOENT || !f || !*f)
+    if (errno != ENOENT || !f || !*f) {
+      complain(p, "can't stat", errno);

       return (0);
       return (0);

+    }

     if (mkdir(p, 0700)) {
     if (mkdir(p, 0700)) {

+      complain(p, "can't create", errno);

       *f = 0;
       return (0);
     }
       *f = 0;
       return (0);
     }


@@ -92,8 +106,10 @@ static int ok(const char *p, int *f)
      * the @mkdir@.
      */
 
      * the @mkdir@.
      */
 

-    if (lstat(p, &st))
+    if (lstat(p, &st)) {
+      complain(p, "can't stat after creating", errno);

       return (0);
       return (0);

+    }

   }
 
   /* --- Make sure the directory is good --- *
   }
 
   /* --- Make sure the directory is good --- *


@@ -102,7 +118,13 @@ static int ok(const char *p, int *f)
    * and writable only by its owner, and that owner must be me.
    */
 
    * and writable only by its owner, and that owner must be me.
    */
 

-  if (S_ISDIR(st.st_mode) && (st.st_mode & 0777) == 0700 && st.st_uid == me)
+  if (!S_ISDIR(st.st_mode))
+    complain(p, "not a directory", 0);
+  else if (st.st_uid != me)
+    complain(p, "not owner", 0);
+  else if ((st.st_mode & 0777) != 0700)
+    complain(p, "non-owner access permitted", 0);
+  else

     return (1);
   return (0);
 }
     return (1);
   return (0);
 }