Make guts into official library.

[checkpath] / chkpath.c

diff --git a/chkpath.c b/chkpath.c
index 250e922..cf86c7f 100644 (file)
--- a/chkpath.c
+++ b/chkpath.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: chkpath.c,v 1.2 2001/01/25 22:16:02 mdw Exp $
+ * $Id: chkpath.c,v 1.3 2003/01/25 23:58:44 mdw Exp $
  *
  * Check a user's file search path
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: chkpath.c,v $
+ * Revision 1.3  2003/01/25 23:58:44  mdw
+ * Make guts into official library.
+ *
  * Revision 1.2  2001/01/25 22:16:02  mdw
  * Make flags be unsigned.
  *
@@ -50,11 +53,11 @@
 #include <mLib/quis.h>
 #include <mLib/report.h>
 
-#include "path.h"
+#include "checkpath.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
-static void report(int what, int verbose,
+static void report(unsigned what, int verbose,
                   const char *p, const char *msg,
                   void *arg)
 {
@@ -106,10 +109,10 @@ 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;
 
 #define f_print 1u
@@ -122,11 +125,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 --- */
 
@@ -196,7 +198,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(':');