summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-08-12 07:43:27 +0000
committernicm <nicm@openbsd.org>2015-08-12 07:43:27 +0000
commit5088824f07c8715549010fa25dec00eff3b0c669 (patch)
tree16aca581e1f50a163c540c521d1b3fc0922d849d
parentupdate author information of the copyright section. (diff)
downloadwireguard-openbsd-5088824f07c8715549010fa25dec00eff3b0c669.tar.xz
wireguard-openbsd-5088824f07c8715549010fa25dec00eff3b0c669.zip
Add string/Ww as aliases for string/Bb, and ignore t. (The latest
version of the original file replaced Bb with Ww and then reused b for something else (!), but alias them instead.)
-rw-r--r--usr.bin/file/magic-test.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/usr.bin/file/magic-test.c b/usr.bin/file/magic-test.c
index 5b9e5b7871f..7f9e6a9cbf4 100644
--- a/usr.bin/file/magic-test.c
+++ b/usr.bin/file/magic-test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magic-test.c,v 1.10 2015/08/11 23:03:26 nicm Exp $ */
+/* $OpenBSD: magic-test.c,v 1.11 2015/08/12 07:43:27 nicm Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -571,14 +571,18 @@ magic_test_type_string(struct magic_line *ml, struct magic_state *ms)
for (; *cp != '\0'; cp++) {
switch (*cp) {
case 'B':
+ case 'W':
Bflag = 1;
break;
case 'b':
+ case 'w':
bflag = 1;
break;
case 'c':
cflag = 1;
break;
+ case 't':
+ break;
default:
return (-1);
}
@@ -950,14 +954,18 @@ magic_test_type_search(struct magic_line *ml, struct magic_state *ms)
for (cp = endptr + 1; *cp != '\0'; cp++) {
switch (*cp) {
case 'B':
+ case 'W':
Bflag = 1;
break;
case 'b':
+ case 'w':
bflag = 1;
break;
case 'c':
cflag = 1;
break;
+ case 't':
+ break;
default:
return (-1);
}