- Added `-I' flag

- Portability fixes

Author: archie.cobbs

CHANGES

@@ -1,4 +1,9 @@
 
+Version 1.0.1
+
+    - Added `-I' flag
+    - Portability fixes
+
 Version 1.0 (r4) released 5 Nov 2010
 
     - Initial release

configure.ac

@@ -39,6 +39,9 @@ AC_CHECK_HEADERS(dirent.h err.h errno.h fcntl.h fnmatch.h fts.h grp.h limits.h p
 # Check for optional header files
 AC_CHECK_HEADERS(openssl/md5.h openssl/sha.h openssl/ripemd.h,,)
 
+# Check for optional functions
+AC_CHECK_FUNCS(getmode getline,,)
+
 # Optional features
 AC_ARG_ENABLE(Werror,
     AC_HELP_STRING([--enable-Werror],

create.c

@@ -105,7 +105,8 @@ cwalk(void)
         while ((p = fts_read(t))) {
                 if (iflag)
                         indent = p->fts_level * 4;
-                if (check_excludes(p->fts_name, p->fts_path)) {
+                if (!check_includes(p->fts_name, p->fts_path)
+                    || check_excludes(p->fts_name, p->fts_path)) {
                         fts_set(t, p, FTS_SKIP);
                         continue;
                 }

excludes.c

@@ -48,33 +48,63 @@
  * We're assuming that there won't be a whole lot of excludes,
  * so it's OK to use a stupid algorithm.
  */
-struct exclude {
-        LIST_ENTRY(exclude) link;
+struct patlist {
+        LIST_ENTRY(patlist) link;
         const char *glob;
         int pathname;
 };
-static LIST_HEAD(, exclude) excludes;
+LIST_HEAD(pathead, patlist);
+
+static struct pathead includes;
+static struct pathead excludes;
+
+static int any_includes;
+
+static void read_patlist_file(struct pathead *pathead, const char *name);
+static int check_patlist(struct pathead *pathead, const char *fname, const char *path);
 
 void
-init_excludes(void)
+init_patlists(void)
 {
+        LIST_INIT(&includes);
         LIST_INIT(&excludes);
 }
 
+void
+read_includes_file(const char *name)
+{
+    read_patlist_file(&includes, name);
+    any_includes = 1;
+}
+
 void
 read_excludes_file(const char *name)
+{
+    read_patlist_file(&excludes, name);
+}
+
+static void
+read_patlist_file(struct pathead *pathead, const char *name)
 {
         FILE *fp;
         char *line, *str;
-        struct exclude *e;
+        struct patlist *e;
+#if HAVE_GETLINE
         ssize_t len;
         size_t alloc;
+#else
+        size_t len;
+#endif
 
         fp = fopen(name, "r");
         if (fp == 0)
                 err(1, "%s", name);
 
-    for (line = NULL; (len = getline(&line, &alloc, fp)) != -1; ) {
+#if HAVE_GETLINE
+        for (line = NULL; (len = getline(&line, &alloc, fp)) != -1; ) {
+#else
+        while ((line = fgetln(fp, &len)) != NULL) {
+#endif
                 if (line[len - 1] == '\n')
                         len--;
                 if (len == 0)
@@ -91,24 +121,40 @@ read_excludes_file(const char *name)
                         e->pathname = 1;
                 else
                         e->pathname = 0;
-                LIST_INSERT_HEAD(&excludes, e, link);
+                LIST_INSERT_HEAD(pathead, e, link);
         }
-    free(line);
+#if HAVE_GETLINE
+        free(line);
+#endif
         fclose(fp);
 }
 
+int
+check_includes(const char *fname, const char *path)
+{
+        return !any_includes || check_patlist(&includes, fname, path);
+}
+
 int
 check_excludes(const char *fname, const char *path)
 {
-        struct exclude *e;
+        return check_patlist(&excludes, fname, path);
+}
+
+static int
+check_patlist(struct pathead *pathead, const char *fname, const char *path)
+{
+        struct patlist *e;
 
         /* fnmatch(3) has a funny return value convention... */
 #define MATCH(g, n) (fnmatch((g), (n), FNM_PATHNAME) == 0)
 
-        LIST_FOREACH(e, &excludes, link) {
+        LIST_FOREACH(e, pathead, link) {
                 if ((e->pathname && MATCH(e->glob, path))
                     || MATCH(e->glob, fname))
                         return 1;
         }
         return 0;
 }
+
+

extern.h

@@ -36,9 +36,6 @@
 
 extern uint32_t crc_total;
 
-#ifdef _FTS_H_
-int      compare(char *, NODE *, FTSENT *);
-#endif
 int      crc(int, uint32_t *, off_t *);
 void     cwalk(void);
 char    *flags_to_string(u_long);
@@ -49,15 +46,19 @@ char    *rlink(char *);
 NODE    *mtree_readspec(FILE *fi);
 int     mtree_verifyspec(FILE *fi);
 int     mtree_specspec(FILE *fi, FILE *fj);
-int compare(char *name, NODE *s, FTSENT *p);
+int     compare(char *name, NODE *s, FTSENT *p);
 
-int      check_excludes(const char *, const char *);
-void     init_excludes(void);
-void     read_excludes_file(const char *);
+int     check_includes(const char *, const char *);
+int     check_excludes(const char *, const char *);
+void    init_patlists(void);
+void    read_includes_file(const char *);
+void    read_excludes_file(const char *);
 const char * ftype(u_int type);
 
+#if !HAVE_GETMODE
 mode_t getmode(const void *bbox, mode_t omode);
 void *setmode(const char *p);
+#endif
 
 #ifdef HAVE_OPENSSL_MD5_H
 char * MD5_File(const char *filename, char *result);

mtree.8

@@ -41,6 +41,9 @@
 .Op Fl f Ar spec
 .Ek
 .Bk -words
+.Op Fl I Ar include-list
+.Ek
+.Bk -words
 .Op Fl K Ar keywords
 .Ek
 .Bk -words
@@ -133,6 +136,22 @@ The output format in this case is somewhat remniscent of
 having "in first spec only", "in second spec only", and "different"
 columns, prefixed by zero, one and two TAB characters respectively.
 Each entry in the "different" column occupies two lines, one from each specification.
+.It Fl I Ar include-list
+The specified file contains
+.Xr fnmatch 3
+patterns matching files to be included in
+the specification, one to a line.
+If the pattern contains a
+.Ql \&/
+character, it will be matched against entire pathnames (relative to
+the starting directory); otherwise,
+it will be matched against basenames only.
+No comments are allowed in
+the
+.Ar include-list
+file.
+.Pp
+If this flag is not present, all files are included by default.
 .It Fl K Ar keywords
 Add the specified (whitespace or comma separated)
 .Ar keywords
@@ -165,6 +184,12 @@ No comments are allowed in
 the
 .Ar exclude-list
 file.
+.Pp
+If both
+.Fl I
+and
+.Fl X
+are specified, any files matching both lists are excluded.
 .El
 .Pp
 Specifications are mostly composed of ``keywords'', i.e., strings

mtree.c

@@ -71,7 +71,7 @@ main(int argc, char *argv[])
 
         dir = NULL;
         keys = KEYDEFAULT;
-        init_excludes();
+        init_patlists();
         spec1 = stdin;
         spec2 = NULL;
 
@@ -98,6 +98,9 @@ main(int argc, char *argv[])
                         } else
                                 usage();
                         break;
+                case 'I':
+                        read_includes_file(optarg);
+                        break;
                 case 'i':
                         iflag = 1;
                         break;

mtree.h

@@ -38,10 +38,6 @@
 
 #define MISMATCHEXIT    2
 
-#define st_atimespec st_atim
-#define st_ctimespec st_ctim
-#define st_mtimespec st_mtim
-
 typedef struct _node {
         struct _node    *parent, *child;        /* up, down */
         struct _node    *prev, *next;           /* left, right */

setmode.c

@@ -30,12 +30,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setmode.c   8.2 (Berkeley) 3/25/94";
-#endif /* LIBC_SCCS and not lint */
-
 #include "config.h"
 
+#if !HAVE_GETMODE
+
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
@@ -448,3 +446,4 @@ compress_mode(BITCMD *set)
                 }
         }
 }
+#endif  /* !HAVE_GETMODE */

verify.c

@@ -90,7 +90,8 @@ vwalk(void)
         level = root;
         specdepth = rval = 0;
         while ((p = fts_read(t))) {
-                if (check_excludes(p->fts_name, p->fts_path)) {
+                if (!check_includes(p->fts_name, p->fts_path)
+                    || check_excludes(p->fts_name, p->fts_path)) {
                         fts_set(t, p, FTS_SKIP);
                         continue;
                 }

vis.h

@@ -39,11 +39,6 @@
 
 #include <sys/types.h>
 
-#ifndef _SIZE_T_DECLARED
-typedef __size_t        size_t;
-#define _SIZE_T_DECLARED
-#endif
-
 /*
  * to select alternate encoding format
  */