/* -*-c-*-
*
- * $Id: tmpdir.c,v 1.1 1999/04/06 20:12:07 mdw Exp $
- *
* Choose and check temporary directories
*
* (c) 1999 Mark Wooding
* 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>
#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 ---------------------------------------------------------*/
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" };
char *p, *q;
char *qq;
- dstr d;
+ dstr d = DSTR_INIT;
int createflag = 1;
/* --- Make sure the parent directory is sane --- *
* 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;
static int fullcheck(const char *p)
{
- return (path_check(p, &cp) == 0 && ok(p, 0));
+ return (checkpath(p, &cp) == 0 && ok(p, 0));
}
/* --- @goodtmp@ --- *
/* --- @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@ --- */
{
int shell = 0;
int duff = 0;
+ char *p;
enum {
sh_unknown,
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");
{ "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);
/* --- Choose a shell --- */
if (!shell) {
- char *p;
if (!(p = getenv("SHELL")))
p = pw->pw_shell;
if (strstr(p, "csh"))
/* --- 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);
}