X-Git-Url: https://git.distorted.org.uk/~mdw/checkpath/blobdiff_plain/efa7a97bf01444f8bfdf25f488932912d3710974..194363d495588e161e933f4254d3a85ad441ff2b:/tmpdir.c

diff --git a/tmpdir.c b/tmpdir.c
index 453ebf3..0920341 100644
--- a/tmpdir.c
+++ b/tmpdir.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: tmpdir.c,v 1.1 1999/04/06 20:12:07 mdw Exp $
+ * $Id: tmpdir.c,v 1.5 2004/04/08 01:36:22 mdw Exp $
  *
  * Choose and check temporary directories
  *
@@ -26,14 +26,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: tmpdir.c,v $
- * Revision 1.1  1999/04/06 20:12:07  mdw
- * Initial revision
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <errno.h>
@@ -52,12 +44,12 @@
 #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 ---------------------------------------------------------*/
@@ -128,7 +120,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 --- *
@@ -139,12 +131,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;
@@ -190,7 +181,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@ --- *
@@ -307,7 +298,7 @@ int main(int argc, char *argv[])
   cp.cp_what = CP_WRWORLD | CP_WRGRP | CP_WROTHUSR | CP_STICKYOK;
   cp.cp_verbose = 0;
   cp.cp_report = 0;
-  path_setids(&cp);
+  checkpath_setids(&cp);
   pw = getpwuid(me);
   if (!pw)
     die(1, "you don't exist");
@@ -321,7 +312,7 @@ int main(int argc, char *argv[])
       { "usage",	0,		0,	'u' },
       { "bourne",	0,		0,	'b' },
       { "cshell",	0,		0,	'c' },
-      { "verify",	gFlag_argReq,	0,	'v' },
+      { "verify",	OPTF_ARGREQ,	0,	'v' },
       { 0,		0,		0,	0 }
     };
     int i = mdwopt(argc, argv, "hVu bcv:", opts, 0, 0, 0);