X-Git-Url: https://git.distorted.org.uk/~mdw/checkpath/blobdiff_plain/d8e113174e0b2ceff6426ba27104343c8f41d447..73e1a5579df9c86292a7efdb29be2a7e915e2121:/tmpdir.c

diff --git a/tmpdir.c b/tmpdir.c
index 137127a..5d19e3a 100644
--- a/tmpdir.c
+++ b/tmpdir.c
@@ -5,7 +5,7 @@
  * (c) 1999 Mark Wooding
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of chkpath.
  *
@@ -13,12 +13,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * chkpath is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with chkpath; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -26,7 +26,10 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#include "config.h"
+
 #include <errno.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -35,6 +38,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <pwd.h>
+#include <grp.h>
 
 #include <mLib/alloc.h>
 #include <mLib/dstr.h>
@@ -44,6 +48,7 @@
 #include <mLib/report.h>
 
 #include "checkpath.h"
+#include "utils.h"
 
 /*----- Static variables --------------------------------------------------*/
 
@@ -179,9 +184,7 @@ good:
  */
 
 static int fullcheck(const char *p)
-{
-  return (checkpath(p, &cp) == 0 && ok(p, 0));
-}
+  { return (checkpath(p, &cp) == 0 && ok(p, 0)); }
 
 /* --- @goodtmp@ --- *
  *
@@ -204,16 +207,12 @@ static char *goodtmp(void)
 
   /* --- Try making a directory in `/tmp' --- */
 
-  if (!(q = getenv("USER")) && !(q = getenv("LOGNAME")))
-    q = pw->pw_name;
-  if ((q = trytmp("/tmp", q)) != 0)
+  if ((q = trytmp("/tmp", pw->pw_name)) != 0)
     return (q);
 
   /* --- That failed: try a directory in the user's home --- */
 
-  if (!(q = getenv("HOME")))
-    q = pw->pw_dir;
-  if ((q = trytmp(q, "tmp")) != 0)
+  if ((q = trytmp(pw->pw_dir, "tmp")) != 0)
     return (q);
 
   /* --- Still no joy: give up --- *
@@ -225,10 +224,17 @@ 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 [-bcv] [-g NAME] [-C PATH]\n", QUIS); }
 
 /* --- @version@ --- */
 
@@ -257,7 +263,9 @@ 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\
+-g, --group NAME	Trust group NAME to be honest and true.\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\
@@ -290,11 +298,12 @@ int main(int argc, char *argv[])
   /* --- Initialize variables --- */
 
   ego(argv[0]);
-  me = getuid();
-  cp.cp_what = CP_WRWORLD | CP_WRGRP | CP_WROTHUSR | CP_STICKYOK;
+  me = cp.cp_uid = geteuid();
+  cp.cp_what = (CP_WRWORLD | CP_WROTHGRP | CP_WROTHUSR |
+		CP_STICKYOK | CP_REPORT);
   cp.cp_verbose = 0;
-  cp.cp_report = 0;
-  checkpath_setids(&cp);
+  cp.cp_report = report;
+  cp.cp_gids = 0;			/* ignore group membership */
   pw = getpwuid(me);
   if (!pw)
     die(1, "you don't exist");
@@ -308,10 +317,14 @@ 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' },
+      { "trust-groups",	0,		0,	't' },
+      { "group",	OPTF_ARGREQ,	0,	'g' },
       { 0,		0,		0,	0 }
     };
-    int i = mdwopt(argc, argv, "hVu bcv:", opts, 0, 0, 0);
+    int i = mdwopt(argc, argv, "hVu" "bcvtg:c:", opts, 0, 0, 0);
 
     if (i < 0)
       break;
@@ -331,9 +344,15 @@ int main(int argc, char *argv[])
       case 'c':
 	shell = sh_csh;
 	break;
-      case 'v':
+      case 'C':
 	return (!fullcheck(optarg));
 	break;
+      case 'g':
+	allowgroup(&cp, optarg);
+	break;
+      case 'v':
+	cp.cp_verbose++;
+	break;
       default:
 	duff = 1;
 	break;