X-Git-Url: https://git.distorted.org.uk/~mdw/checkpath/blobdiff_plain/efa7a97bf01444f8bfdf25f488932912d3710974..b4809431cd3c454bb205d2ed9b02df95c633707a:/chkpath.c

diff --git a/chkpath.c b/chkpath.c
index e90b0d7..65d9390 100644
--- a/chkpath.c
+++ b/chkpath.c
@@ -1,13 +1,11 @@
 /* -*-c-*-
  *
- * $Id: chkpath.c,v 1.1 1999/04/06 20:12:07 mdw Exp $
- *
  * Check a user's file search path
  *
  * (c) 1999 Mark Wooding
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of chkpath.
  *
@@ -15,27 +13,21 @@
  * 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: chkpath.c,v $
- * Revision 1.1  1999/04/06 20:12:07  mdw
- * Initial revision
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
+#include "config.h"
+
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
@@ -47,30 +39,26 @@
 #include <mLib/quis.h>
 #include <mLib/report.h>
 
-#include "path.h"
+#include "checkpath.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
-static void report(int what, int verbose,
+/* --- @report@ --- */
+
+static void report(unsigned what, int verbose,
 		   const char *p, const char *msg,
 		   void *arg)
-{
-  moan("%s", msg);
-}
+  { moan("%s", msg); }
 
 /* --- @usage@ --- */
 
 static void usage(FILE *fp)
-{
-  fprintf(fp, "Usage: %s [-vqstp] [PATH...]\n", QUIS);
-}
+  { fprintf(fp, "Usage: %s [-vqstp] [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@ --- */
 
@@ -103,16 +91,14 @@ Options provided are:\n\
 
 int main(int argc, char *argv[])
 {
-  int bad = 0;
+  unsigned bad = 0;
   int i;
   char *p, *q, *path;
-  struct chkpath cp;
+  struct checkpath cp;
   int f = 0;
 
-  enum {
-    f_print = 1,
-    f_colon = 2
-  };
+#define f_print 1u
+#define f_colon 2u
 
   /* --- Initialize the world --- */
 
@@ -121,11 +107,10 @@ int main(int argc, char *argv[])
   /* --- Set up path scanning defaults --- */
 
   cp.cp_verbose = 1;
-  cp.cp_what = (CP_WRWORLD | CP_WRGRP | CP_WROTHUSR |
-		CP_ERROR | CP_REPORT | CP_SYMLINK);
+  cp.cp_what = CP_PROBLEMS | CP_REPORT | CP_SYMLINK;
   cp.cp_report = report;
   cp.cp_arg = 0;
-  path_setids(&cp);
+  checkpath_setids(&cp);
 
   /* --- Parse the options --- */
 
@@ -141,7 +126,7 @@ int main(int argc, char *argv[])
       { "print",	0,		0,	'p' },
       { 0,		0,		0,	0 }
     };
-    int i = mdwopt(argc, argv, "hVu vqstp", opts, 0, 0, 0);
+    int i = mdwopt(argc, argv, "hVu" "vqstp", opts, 0, 0, 0);
 
     if (i < 0)
       break;
@@ -195,7 +180,7 @@ int main(int argc, char *argv[])
     p = xstrdup(argv[i]);
     q = strtok(p, ":");
     while (q) {
-      int b = path_check(q, &cp);
+      unsigned b = checkpath(q, &cp);
       if (!b && (f & f_print)) {
 	if (f & f_colon)
 	  putchar(':');