checkpath.c: Allocate the state from a resource pool.

[checkpath] / chkpath.c

diff --git a/chkpath.c b/chkpath.c
index a44570e5816e47252e4fab347ccfebb95b042a10..a7158d3c7efb3978fc7813e0f9dd957b630c3e03 100644 (file)
--- a/chkpath.c
+++ b/chkpath.c
@@ -57,7 +57,7 @@ static void report(unsigned what, int verbose,
 /* --- @usage@ --- */
 
 static void usage(FILE *fp)
 /* --- @usage@ --- */
 
 static void usage(FILE *fp)

-  { fprintf(fp, "Usage: %s [-vqstp] [-g NAME] [PATH...]\n", QUIS); }
+  { fprintf(fp, "Usage: %s [-pqstv] [-g NAME] [PATH...]\n", QUIS); }

 
 /* --- @version@ --- */
 
 
 /* --- @version@ --- */
 


@@ -83,13 +83,13 @@ Options provided are:\n\
 -V, --version          Display the program's version number.\n\
 -u, --usage            Show a terse usage summary.\n\
 \n\
 -V, --version          Display the program's version number.\n\
 -u, --usage            Show a terse usage summary.\n\
 \n\

--v, --verbose          Be verbose about the search progress (cumulative).\n\
+-g, --group NAME       Consider members of group NAME trustworthy.\n\
+-p, --print            Write the secure path elements to standard output.\n\

 -q, --quiet            Be quiet about the search progress (cumulative).\n\
 -s, --sticky           Consider sticky directories secure against\n\
                        modification by world and group (not recommended).\n\
 -q, --quiet            Be quiet about the search progress (cumulative).\n\
 -s, --sticky           Consider sticky directories secure against\n\
                        modification by world and group (not recommended).\n\

--t, --trust-group      Consider other members of your group trustworthy.\n\
--g, --group NAME       Consider members of group NAME trustworthy.\n\
--p, --print            Write the secure path elements to standard output.\n\
+-t, --trust-groups     Consider other members of your group trustworthy.\n\
+-v, --verbose          Be verbose about the search progress (cumulative).\n\

 ",
        fp);
 }
 ",
        fp);
 }


@@ -125,15 +125,16 @@ int main(int argc, char *argv[])
       { "help",                0,              0,      'h' },
       { "version",     0,              0,      'V' },
       { "usage",       0,              0,      'u' },
       { "help",                0,              0,      'h' },
       { "version",     0,              0,      'V' },
       { "usage",       0,              0,      'u' },

-      { "verbose",     0,              0,      'v' },
+      { "group",       OPTF_ARGREQ,    0,      'g' },
+      { "print",       0,              0,      'p' },

       { "quiet",       0,              0,      'q' },
       { "sticky",      0,              0,      's' },
       { "quiet",       0,              0,      'q' },
       { "sticky",      0,              0,      's' },

-      { "trust-group", 0,              0,      't' },
-      { "print",       0,              0,      'p' },
+      { "trust-groups",        0,              0,      't' },
+      { "verbose",     0,              0,      'v' },

       { 0,             0,              0,      0 }
     };
       { 0,             0,              0,      0 }
     };

-    int i = mdwopt(argc, argv, "hVu" "vqstpg:", opts, 0, 0, 0);

 
 

+    i = mdwopt(argc, argv, "hVu" "g:pqstv", opts, 0, 0, 0);

     if (i < 0)
       break;
     switch (i) {
     if (i < 0)
       break;
     switch (i) {


@@ -146,8 +147,11 @@ int main(int argc, char *argv[])
       case 'u':
        usage(stdout);
        exit(0);
       case 'u':
        usage(stdout);
        exit(0);

-      case 'v':
-       cp.cp_verbose++;
+      case 'g':
+       allowgroup(&cp, optarg);
+       break;
+      case 'p':
+       f |= f_print;

        break;
       case 'q':
        if (cp.cp_verbose)
        break;
       case 'q':
        if (cp.cp_verbose)


@@ -160,11 +164,8 @@ int main(int argc, char *argv[])
        if (checkpath_setgid(&cp) || checkpath_setgroups(&cp))
          die(1, "too many groups");
        break;
        if (checkpath_setgid(&cp) || checkpath_setgroups(&cp))
          die(1, "too many groups");
        break;

-      case 'g':
-       allowgroup(&cp, optarg);
-       break;
-      case 'p':
-       f |= f_print;
+      case 'v':
+       cp.cp_verbose++;

        break;
       default:
        bad = 1;
        break;
       default:
        bad = 1;