View | Details | Raw Unified | Return to bug 16944
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD: src/usr.sbin/mtree/Makefile,v 1.6.2.1 1999/08/29 15:44:16 peter Exp $
2
# $FreeBSD: src/usr.sbin/mtree/Makefile,v 1.6.2.1 1999/08/29 15:44:16 peter Exp $
3
3
4
PROG=	mtree
4
PROG=	mtree
5
SRCS=	compare.c crc.c create.c misc.c mtree.c spec.c verify.c
5
SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
6
MAN8=	mtree.8
6
MAN8=	mtree.8
7
.PATH:	${.CURDIR}/../../usr.bin/cksum
7
.PATH:	${.CURDIR}/../../usr.bin/cksum
8
8
(-)create.c (+4 lines)
Lines 97-102 Link Here
97
	while ((p = fts_read(t))) {
97
	while ((p = fts_read(t))) {
98
		if (iflag)
98
		if (iflag)
99
			indent = p->fts_level * 4;
99
			indent = p->fts_level * 4;
100
		if (check_excludes(p->fts_name, p->fts_path)) {
101
			fts_set(t, p, FTS_SKIP);
102
			continue;
103
		}
100
		switch(p->fts_info) {
104
		switch(p->fts_info) {
101
		case FTS_D:
105
		case FTS_D:
102
			if (!dflag)
106
			if (!dflag)
(-)excludes.c (+102 lines)
Added Link Here
1
/*
2
 * Copyright 2000 Massachusetts Institute of Technology
3
 *
4
 * Permission to use, copy, modify, and distribute this software and
5
 * its documentation for any purpose and without fee is hereby
6
 * granted, provided that both the above copyright notice and this
7
 * permission notice appear in all copies, that both the above
8
 * copyright notice and this permission notice appear in all
9
 * supporting documentation, and that the name of M.I.T. not be used
10
 * in advertising or publicity pertaining to distribution of the
11
 * software without specific, written prior permission.  M.I.T. makes
12
 * no representations about the suitability of this software for any
13
 * purpose.  It is provided "as is" without express or implied
14
 * warranty.
15
 * 
16
 * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
17
 * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
18
 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
20
 * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
21
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
23
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
25
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
26
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27
 * SUCH DAMAGE.
28
 */
29
30
#include <sys/types.h>
31
#include <sys/queue.h>
32
33
#include <err.h>
34
#include <fnmatch.h>
35
#include <fts.h>
36
#include <stdio.h>
37
#include <stdlib.h>
38
39
/*
40
 * We're assuming that there won't be a whole lot of excludes, 
41
 * so it's OK to use a stupid algorithm.
42
 */
43
struct exclude {
44
	LIST_ENTRY(exclude) link;
45
	const char *glob;
46
	int pathname;
47
};
48
static LIST_HEAD(, exclude) excludes;
49
50
void
51
init_excludes(void)
52
{
53
	LIST_INIT(&excludes);
54
}
55
56
void
57
read_excludes_file(const char *name)
58
{
59
	FILE *fp;
60
	char *line, *str;
61
	struct exclude *e;
62
	size_t len;
63
64
	fp = fopen(name, "r");
65
	if (fp == 0)
66
		err(1, "%s", name);
67
68
	while ((line = fgetln(fp, &len)) != 0) {
69
		if (line[len - 1] == '\n')
70
			len--;
71
		if (len == 0)
72
			continue;
73
74
		str = malloc(len + 1);
75
		e = malloc(sizeof *e);
76
		if (str == 0 || e == 0)
77
			errx(1, "memory allocation error");
78
		e->glob = str;
79
		memcpy(str, line, len);
80
		str[len] = '\0';
81
		if (strchr(str, '/'))
82
			e->pathname = 1;
83
		LIST_INSERT_HEAD(&excludes, e, link);
84
	}
85
	fclose(fp);
86
}
87
88
int
89
check_excludes(const char *fname, const char *path)
90
{
91
	struct exclude *e;
92
93
	/* fnmatch(3) has a funny return value convention... */
94
#define MATCH(g, n) (fnmatch((g), (n), FNM_PATHNAME) == 0)
95
96
	for (e = excludes.lh_first; e != 0; e = e->link.le_next) {
97
		if (e->pathname && MATCH(e->glob, path) 
98
		    || MATCH(e->glob, fname))
99
			return 1;
100
	}
101
	return 0;
102
}
(-)extern.h (+4 lines)
Lines 41-43 Link Here
41
char	*rlink __P((char *));
41
char	*rlink __P((char *));
42
NODE	*spec __P((void));
42
NODE	*spec __P((void));
43
int	 verify __P((void));
43
int	 verify __P((void));
44
45
int	 check_excludes __P((const char *, const char *));
46
void	 init_excludes __P((void));
47
void	 read_excludes_file __P((const char *));
(-)mtree.8 (+14 lines)
Lines 46-51 Link Here
46
.Op Fl k Ar keywords
46
.Op Fl k Ar keywords
47
.Op Fl p Ar path
47
.Op Fl p Ar path
48
.Op Fl s Ar seed
48
.Op Fl s Ar seed
49
.Op Fl X Ar exclude-list
49
.Sh DESCRIPTION
50
.Sh DESCRIPTION
50
The utility
51
The utility
51
.Nm mtree
52
.Nm mtree
Lines 117-122 Link Here
117
the specification.
118
the specification.
118
.It Fl x
119
.It Fl x
119
Don't descend below mount points in the file hierarchy.
120
Don't descend below mount points in the file hierarchy.
121
.It Fl X Ar exclude-list
122
The specified file contains
123
.Xr fnmatch 3
124
patterns matching files to be excluded from
125
the specification, one to a line.
126
If the pattern contains a
127
.Ql \&/
128
character, it will be matched against entire pathnames (relative to
129
the starting directory); otherwise,
130
it will be matched against basenames only.  No comments are allowed in
131
the
132
.Ar exclude-list
133
file.
120
.El
134
.El
121
.Pp
135
.Pp
122
Specifications are mostly composed of ``keywords'', i.e. strings that
136
Specifications are mostly composed of ``keywords'', i.e. strings that
(-)mtree.c (-2 / +8 lines)
Lines 75-81 Link Here
75
75
76
	dir = NULL;
76
	dir = NULL;
77
	keys = KEYDEFAULT;
77
	keys = KEYDEFAULT;
78
	while ((ch = getopt(argc, argv, "cdef:iK:k:np:rs:Uux")) != -1)
78
	init_excludes();
79
80
	while ((ch = getopt(argc, argv, "cdef:iK:k:np:rs:UuxX:")) != -1)
79
		switch((char)ch) {
81
		switch((char)ch) {
80
		case 'c':
82
		case 'c':
81
			cflag = 1;
83
			cflag = 1;
Lines 128-133 Link Here
128
		case 'x':
130
		case 'x':
129
			ftsoptions |= FTS_XDEV;
131
			ftsoptions |= FTS_XDEV;
130
			break;
132
			break;
133
		case 'X':
134
			read_excludes_file(optarg);
135
			break;
131
		case '?':
136
		case '?':
132
		default:
137
		default:
133
			usage();
138
			usage();
Lines 158-163 Link Here
158
usage()
163
usage()
159
{
164
{
160
	(void)fprintf(stderr,
165
	(void)fprintf(stderr,
161
"usage: mtree [-cdeinrUux] [-f spec] [-K key] [-k key] [-p path] [-s seed]\n");
166
"usage: mtree [-cdeinrUux] [-f spec] [-K key] [-k key] [-p path] [-s seed]\n"
167
"\t[-X excludes]\n");
162
	exit(1);
168
	exit(1);
163
}
169
}
(-)verify.c (+4 lines)
Lines 90-95 Link Here
90
	level = root;
90
	level = root;
91
	specdepth = rval = 0;
91
	specdepth = rval = 0;
92
	while ((p = fts_read(t))) {
92
	while ((p = fts_read(t))) {
93
		if (check_excludes(p->fts_name, p->fts_path)) {
94
			fts_set(t, p, FTS_SKIP);
95
			continue;
96
		}
93
		switch(p->fts_info) {
97
		switch(p->fts_info) {
94
		case FTS_D:
98
		case FTS_D:
95
			break;
99
			break;

Return to bug 16944