X-Git-Url: https://git.distorted.org.uk/~mdw/checkpath/blobdiff_plain/cef4f7979a419effd800c8d5360ab7762a0e18a3..3d62246fb045a0674c43e65fd5eea5e5bfa5a42d:/tmpdir.c

diff --git a/tmpdir.c b/tmpdir.c
index 4a2843d..8e704e6 100644
--- a/tmpdir.c
+++ b/tmpdir.c
@@ -1,7 +1,5 @@
 /* -*-c-*-
  *
- * $Id: tmpdir.c,v 1.2 1999/05/19 20:37:28 mdw Exp $
- *
  * Choose and check temporary directories
  *
  * (c) 1999 Mark Wooding
@@ -26,17 +24,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: tmpdir.c,v $
- * Revision 1.2  1999/05/19 20:37:28  mdw
- * Track gratuitous change in mdwopt interface.
- *
- * Revision 1.1.1.1  1999/04/06 20:12:07  mdw
- * Import new project.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <errno.h>
@@ -51,16 +38,17 @@
 
 #include <mLib/alloc.h>
 #include <mLib/dstr.h>
+#include <mLib/macros.h>
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
 #include <mLib/report.h>
 
-#include "path.h"
+#include "checkpath.h"
 
 /*----- Static variables --------------------------------------------------*/
 
 static uid_t me;
-static struct chkpath cp;
+static struct checkpath cp;
 static struct passwd *pw;
 
 /*----- Main code ---------------------------------------------------------*/
@@ -131,7 +119,7 @@ static char *trytmp(const char *parent, const char *base)
 		      "ABCDEFGHIJKLMNOPQRSTUVWXYZ" };
   char *p, *q;
   char *qq;
-  dstr d;
+  dstr d = DSTR_INIT;
   int createflag = 1;
 
   /* --- Make sure the parent directory is sane --- *
@@ -142,12 +130,11 @@ static char *trytmp(const char *parent, const char *base)
    * safe.
    */
 
-  if (path_check(parent, &cp))
+  if (checkpath(parent, &cp))
     return (0);
 
   /* --- See whether the trivial version will work --- */
 
-  dstr_create(&d);
   dstr_putf(&d, "%s/%s", parent, base);
   if (ok(d.buf, &createflag))
     goto good;
@@ -193,7 +180,7 @@ good:
 
 static int fullcheck(const char *p)
 {
-  return (path_check(p, &cp) == 0 && ok(p, 0));
+  return (checkpath(p, &cp) == 0 && ok(p, 0));
 }
 
 /* --- @goodtmp@ --- *
@@ -238,19 +225,22 @@ static char *goodtmp(void)
   return (0);
 }
 
+/* --- @report@ --- */
+
+static void report(unsigned what, int verbose,
+		   const char *p, const char *msg,
+		   void *arg)
+  { moan("%s", msg); }
+
 /* --- @usage@ --- */
 
 static void usage(FILE *fp)
-{
-  fprintf(fp, "Usage: %s [-bc] [-v PATH]\n", QUIS);
-}
+  { fprintf(fp, "Usage: %s [-bc] [-v PATH]\n", QUIS); }
 
 /* --- @version@ --- */
 
 static void version(FILE *fp)
-{
-  fprintf(fp, "%s version %s\n", QUIS, VERSION);
-}
+  { fprintf(fp, "%s version %s\n", QUIS, VERSION); }
 
 /* --- @help@ --- */
 
@@ -274,7 +264,8 @@ Options supported:\n\
 \n\
 -b, --bourne		Output a `TMPDIR' setting for Bourne shell users.\n\
 -c, --cshell		Output a `TMPDIR' setting for C shell users.\n\
--v, --verify PATH	Check whether PATH is good, setting exit status.\n\
+-v, --verbose		Report problems to standard error.\n\
+-C, --check PATH	Check whether PATH is good, setting exit status.\n\
 \n\
 The default action is to examine the caller's shell and output a suitable\n\
 setting for that shell type.\n\
@@ -296,6 +287,7 @@ int main(int argc, char *argv[])
 {
   int shell = 0;
   int duff = 0;
+  char *p;
 
   enum {
     sh_unknown,
@@ -307,10 +299,10 @@ int main(int argc, char *argv[])
 
   ego(argv[0]);
   me = getuid();
-  cp.cp_what = CP_WRWORLD | CP_WRGRP | CP_WROTHUSR | CP_STICKYOK;
+  cp.cp_what = CP_WRWORLD | CP_WRGRP | CP_WROTHUSR | CP_STICKYOK | CP_REPORT;
   cp.cp_verbose = 0;
-  cp.cp_report = 0;
-  path_setids(&cp);
+  cp.cp_report = report;
+  checkpath_setids(&cp);
   pw = getpwuid(me);
   if (!pw)
     die(1, "you don't exist");
@@ -324,10 +316,12 @@ int main(int argc, char *argv[])
       { "usage",	0,		0,	'u' },
       { "bourne",	0,		0,	'b' },
       { "cshell",	0,		0,	'c' },
-      { "verify",	OPTF_ARGREQ,	0,	'v' },
+      { "check",	OPTF_ARGREQ,	0,	'C' },
+      { "verify",	OPTF_ARGREQ,	0,	'C' },
+      { "verbose",	0,		0,	'v' },
       { 0,		0,		0,	0 }
     };
-    int i = mdwopt(argc, argv, "hVu bcv:", opts, 0, 0, 0);
+    int i = mdwopt(argc, argv, "hVu bcvc:", opts, 0, 0, 0);
 
     if (i < 0)
       break;
@@ -347,9 +341,12 @@ int main(int argc, char *argv[])
       case 'c':
 	shell = sh_csh;
 	break;
-      case 'v':
+      case 'C':
 	return (!fullcheck(optarg));
 	break;
+      case 'v':
+	cp.cp_verbose++;
+	break;
       default:
 	duff = 1;
 	break;
@@ -364,7 +361,6 @@ int main(int argc, char *argv[])
   /* --- Choose a shell --- */
 
   if (!shell) {
-    char *p;
     if (!(p = getenv("SHELL")))
       p = pw->pw_shell;
     if (strstr(p, "csh"))
@@ -375,19 +371,16 @@ int main(int argc, char *argv[])
 
   /* --- Start the checking --- */
 
-  {
-    char *p = goodtmp();
-    if (!p)
-      die(1, "no good tmp directory");
-    switch (shell) {
-      case sh_bourne:
-	printf("TMPDIR=\"%s\"; export TMPDIR\n", p);
-	break;
-      case sh_csh:
-	printf("setenv TMPDIR \"%s\"\n", p);
+  if ((p = goodtmp()) == 0)
+    die(1, "no good tmp directory");
+  switch (shell) {
+    case sh_bourne:
+      printf("TMPDIR=\"%s\"; export TMPDIR\n", p);
+      break;
+    case sh_csh:
+      printf("setenv TMPDIR \"%s\"\n", p);
 	break;
-    }
-  }
+  }	
 
   return (0);
 }