From d17fa4e775df472e1132a3439ff2290e528a1d5e Mon Sep 17 00:00:00 2001 From: phk Date: Tue, 21 Oct 2003 08:27:05 +0000 Subject: Remove clause 3 in the copyrights (according to permission in src/COPYRIGHT) Remove trailing whitespace. --- usr.sbin/mtree/compare.c | 8 ++------ usr.sbin/mtree/create.c | 10 +++------- usr.sbin/mtree/excludes.c | 6 +++--- usr.sbin/mtree/extern.h | 6 +----- usr.sbin/mtree/misc.c | 6 +----- usr.sbin/mtree/mtree.c | 6 +----- usr.sbin/mtree/mtree.h | 6 +----- usr.sbin/mtree/spec.c | 6 +----- usr.sbin/mtree/verify.c | 8 ++------ 9 files changed, 15 insertions(+), 47 deletions(-) diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c index 9008e1d..33683f5 100644 --- a/usr.sbin/mtree/compare.c +++ b/usr.sbin/mtree/compare.c @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -269,7 +265,7 @@ typeerr: LABEL; tab = "\t"; } else if (strcmp(new_digest, s->sha1digest)) { LABEL; - printf("%sSHA-1 expected %s found %s\n", + printf("%sSHA-1 expected %s found %s\n", tab, s->sha1digest, new_digest); tab = "\t"; } diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c index 420ac5b..ff1b07f 100644 --- a/usr.sbin/mtree/create.c +++ b/usr.sbin/mtree/create.c @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -164,7 +160,7 @@ statf(int indent, FTSENT *p) offset = printf("%*s%s", indent, "", escaped_name); else offset = printf("%*s %s", indent, "", escaped_name); - + free(escaped_name); if (offset > (INDENTNAMELEN + indent)) @@ -342,7 +338,7 @@ statd(FTS *t, FTSENT *parent, uid_t *puid, gid_t *pgid, mode_t *pmode, u_long *p */ if ((((keys & F_UNAME) | (keys & F_UID)) && (*puid != saveuid)) || (((keys & F_GNAME) | (keys & F_GID)) && (*pgid != savegid)) || - ((keys & F_MODE) && (*pmode != savemode)) || + ((keys & F_MODE) && (*pmode != savemode)) || ((keys & F_FLAGS) && (*pflags != saveflags)) || (first)) { first = 0; diff --git a/usr.sbin/mtree/excludes.c b/usr.sbin/mtree/excludes.c index e67cdb9..21a49b0 100644 --- a/usr.sbin/mtree/excludes.c +++ b/usr.sbin/mtree/excludes.c @@ -12,7 +12,7 @@ * no representations about the suitability of this software for any * purpose. It is provided "as is" without express or implied * warranty. - * + * * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include "extern.h" /* - * We're assuming that there won't be a whole lot of excludes, + * We're assuming that there won't be a whole lot of excludes, * so it's OK to use a stupid algorithm. */ struct exclude { @@ -103,7 +103,7 @@ check_excludes(const char *fname, const char *path) #define MATCH(g, n) (fnmatch((g), (n), FNM_PATHNAME) == 0) LIST_FOREACH(e, &excludes, link) { - if ((e->pathname && MATCH(e->glob, path)) + if ((e->pathname && MATCH(e->glob, path)) || MATCH(e->glob, fname)) return 1; } diff --git a/usr.sbin/mtree/extern.h b/usr.sbin/mtree/extern.h index f1630af..6018a6b 100644 --- a/usr.sbin/mtree/extern.h +++ b/usr.sbin/mtree/extern.h @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c index d61ffc5..b970328 100644 --- a/usr.sbin/mtree/misc.c +++ b/usr.sbin/mtree/misc.c @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c index 406da31..b858a00 100644 --- a/usr.sbin/mtree/mtree.c +++ b/usr.sbin/mtree/mtree.c @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.sbin/mtree/mtree.h b/usr.sbin/mtree/mtree.h index 9d8af5d..7d899c6 100644 --- a/usr.sbin/mtree/mtree.h +++ b/usr.sbin/mtree/mtree.h @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c index 9e5f93c..230847d 100644 --- a/usr.sbin/mtree/spec.c +++ b/usr.sbin/mtree/spec.c @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c index 4028839..c95de38 100644 --- a/usr.sbin/mtree/verify.c +++ b/usr.sbin/mtree/verify.c @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -173,7 +169,7 @@ miss(NODE *p, char *tail) /* Don't print missing message if file exists as a symbolic link and the -q flag is set. */ struct stat statbuf; - + if (qflag && stat(path, &statbuf) == 0) p->flags |= F_VISIT; else -- cgit v1.1