Eliminate trailing whitespace.

[checkpath] / tmpdir.c

diff --git a/tmpdir.c b/tmpdir.c
index fed0810..fde2e74 100644 (file)
--- a/tmpdir.c
+++ b/tmpdir.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: tmpdir.c,v 1.3 1999/05/21 22:07:20 mdw Exp $
+ * $Id: tmpdir.c,v 1.5 2004/04/08 01:36:22 mdw Exp $
  *
  * Choose and check temporary directories
  *
  * (c) 1999 Mark Wooding
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of chkpath.
  *
@@ -15,31 +15,17 @@
  * 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.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: tmpdir.c,v $
- * Revision 1.3  1999/05/21 22:07:20  mdw
- * Take advantage of new dynamic string macros.
- *
- * 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>
@@ -58,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 ---------------------------------------------------------*/
@@ -145,7 +131,7 @@ 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 --- */
@@ -194,9 +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@ --- *
  *
@@ -219,16 +203,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 --- *
@@ -243,16 +223,12 @@ static char *goodtmp(void)
 /* --- @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@ --- */
 
@@ -308,11 +284,11 @@ int main(int argc, char *argv[])
   /* --- Initialize variables --- */
 
   ego(argv[0]);
-  me = getuid();
+  me = geteuid();
   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");
@@ -329,7 +305,7 @@ int main(int argc, char *argv[])
       { "verify",      OPTF_ARGREQ,    0,      'v' },
       { 0,             0,              0,      0 }
     };
-    int i = mdwopt(argc, argv, "hVu bcv:", opts, 0, 0, 0);
+    int i = mdwopt(argc, argv, "hVu" "bcv:", opts, 0, 0, 0);
 
     if (i < 0)
       break;