summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mtree
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2016-08-16 16:41:46 +0000
committerkrw <krw@openbsd.org>2016-08-16 16:41:46 +0000
commit9cc113c92c5fb8366b502bf1206c26b0d1037091 (patch)
treef997bdf2e150516fd5d928d6b917815a4a3e6607 /usr.sbin/mtree
parentNuke some erroneous leading whitespace. (diff)
downloadwireguard-openbsd-9cc113c92c5fb8366b502bf1206c26b0d1037091.tar.xz
wireguard-openbsd-9cc113c92c5fb8366b502bf1206c26b0d1037091.zip
Nuke a bunch of whitespace nits seen while '%q' hunting.
Diffstat (limited to 'usr.sbin/mtree')
-rw-r--r--usr.sbin/mtree/compare.c14
-rw-r--r--usr.sbin/mtree/create.c5
-rw-r--r--usr.sbin/mtree/spec.c6
-rw-r--r--usr.sbin/mtree/verify.c4
4 files changed, 14 insertions, 15 deletions
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index aff4fa8a392..0582e75c39c 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -1,5 +1,5 @@
/* $NetBSD: compare.c,v 1.11 1996/09/05 09:56:48 mycroft Exp $ */
-/* $OpenBSD: compare.c,v 1.26 2016/08/14 20:53:19 krw Exp $ */
+/* $OpenBSD: compare.c,v 1.27 2016/08/16 16:41:46 krw Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -212,11 +212,11 @@ typeerr: LABEL;
if (utimes(p->fts_accpath, tv))
(void)printf(", not modified: %s)\n",
strerror(errno));
- else
- (void)printf(", modified)\n");
+ else
+ (void)printf(", modified)\n");
} else
(void)printf(")\n");
- tab = "\t";
+ tab = "\t";
}
}
if (s->flags & F_CKSUM) {
@@ -327,18 +327,18 @@ typeerr: LABEL;
REPLACE_COMMA(cur_flags);
printf("%sflags (%s, %s", tab, (*db_flags == '\0') ?
"-" : db_flags,
- (*cur_flags == '\0') ?
+ (*cur_flags == '\0') ?
"-" : cur_flags);
tab = "\t";
if (uflag)
if (chflags(p->fts_accpath, s->file_flags))
(void)printf(", not modified: %s)\n",
strerror(errno));
- else
+ else
(void)printf(", modified)\n");
else
(void)printf(")\n");
- tab = "\t";
+ tab = "\t";
free(db_flags);
free(cur_flags);
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index b0b280a5c3b..e2a25e3d4dc 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -1,5 +1,5 @@
/* $NetBSD: create.c,v 1.11 1996/09/05 09:24:19 mycroft Exp $ */
-/* $OpenBSD: create.c,v 1.31 2016/08/14 20:53:19 krw Exp $ */
+/* $OpenBSD: create.c,v 1.32 2016/08/16 16:41:46 krw Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -116,7 +116,6 @@ cwalk(void)
if (!dflag)
statf(indent, p);
break;
-
}
}
(void)fts_close(t);
@@ -139,7 +138,7 @@ statf(int indent, FTSENT *p)
escaped_name = malloc(esc_len);
if (escaped_name == NULL)
error("statf: %s", strerror(errno));
- strnvis(escaped_name, p->fts_name, esc_len,
+ strnvis(escaped_name, p->fts_name, esc_len,
VIS_WHITE | VIS_OCTAL | VIS_GLOB);
if (iflag || S_ISDIR(p->fts_statp->st_mode))
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index f74f9e7cf8c..de234b4ab46 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -1,5 +1,5 @@
/* $NetBSD: spec.c,v 1.6 1995/03/07 21:12:12 cgd Exp $ */
-/* $OpenBSD: spec.c,v 1.27 2016/08/14 18:34:48 guenther Exp $ */
+/* $OpenBSD: spec.c,v 1.28 2016/08/16 16:41:46 krw Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -97,7 +97,7 @@ spec(void)
set(p, centry);
continue;
}
-
+
/* Grab file name, "$", "set", or "unset". */
if ((p = strtok(p, "\n\t ")) == NULL)
error("missing field");
@@ -200,7 +200,7 @@ set(char *t, NODE *ip)
if (strtofflags(&val, &fset, &fclr))
error("%s", strerror(errno));
ip->file_flags = fset;
- break;
+ break;
case F_GID:
ip->st_gid = strtoul(val, &ep, 10);
if (*ep)
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index c82f799fc95..27ec631f3fe 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: verify.c,v 1.20 2015/01/16 06:40:18 deraadt Exp $ */
+/* $OpenBSD: verify.c,v 1.21 2016/08/16 16:41:46 krw Exp $ */
/* $NetBSD: verify.c,v 1.10 1995/03/07 21:26:28 cgd Exp $ */
/*-
@@ -85,7 +85,7 @@ vwalk(void)
case FTS_DP:
if (specdepth > p->fts_level) {
for (level = level->parent; level->prev;
- level = level->prev);
+ level = level->prev);
--specdepth;
}
continue;