commit: a41ca8c1b896fe661eac390d8a5d979cc1d50e57
parent: aec8612a21a3dde2f466b084675a06f6b364a6d4
author: Brian Callahan <bcallah@openbsd.org>
date: Sun, 1 Nov 2020 10:49:27 -0500
Post-6.8, cclasses was made const. Let's chase that.
4 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/CVS/Entries b/CVS/Entries
@@ -10,37 +10,37 @@
/var.c/1.71/Result of merge//
/emacs.c/1.87/Result of merge//
/sh.h/1.76/Result of merge//
-/CONTRIBUTORS/1.11/Sat Oct 31 00:41:26 2020//
-/LEGAL/1.2/Sat Oct 31 00:41:26 2020//
-/Makefile/1.39/Sat Oct 31 00:41:34 2020//
-/NOTES/1.16/Sat Oct 31 00:41:26 2020//
-/PROJECTS/1.9/Sat Oct 31 00:41:26 2020//
-/README/1.16/Sat Oct 31 00:41:34 2020//
-/alloc.c/1.19/Sat Oct 31 00:41:26 2020//
-/c_ksh.c/1.62/Sat Oct 31 00:41:26 2020//
-/c_sh.c/1.64/Sat Oct 31 00:41:26 2020//
-/c_test.h/1.4/Sat Oct 31 00:41:26 2020//
-/c_ulimit.c/1.29/Sat Oct 31 00:41:26 2020//
-/edit.h/1.12/Sat Oct 31 00:41:26 2020//
/eval.c/1.66/Result of merge//
-/expand.h/1.15/Sat Oct 31 00:41:26 2020//
-/expr.c/1.34/Sat Oct 31 00:41:26 2020//
-/jobs.c/1.62/Sat Oct 31 00:41:26 2020//
-/ksh.1/1.210/Sat Oct 31 00:41:35 2020//
-/lex.c/1.78/Sat Oct 31 00:41:26 2020//
-/lex.h/1.21/Sat Oct 31 00:41:26 2020//
-/mail.c/1.27/Sat Oct 31 00:41:26 2020//
/misc.c/1.76/Result of merge//
-/path.c/1.23/Sat Oct 31 00:41:26 2020//
-/sh.1/1.152/Sat Oct 31 00:41:26 2020//
-/shf.c/1.34/Sat Oct 31 00:41:26 2020//
-/shf.h/1.8/Sat Oct 31 00:41:26 2020//
-/syn.c/1.39/Sat Oct 31 00:41:26 2020//
-/table.c/1.25/Sat Oct 31 00:41:26 2020//
-/table.h/1.15/Sat Oct 31 00:41:26 2020//
-/tree.c/1.34/Sat Oct 31 00:41:26 2020//
-/tree.h/1.12/Sat Oct 31 00:41:26 2020//
-/tty.h/1.6/Sat Oct 31 00:41:26 2020//
-/version.c/1.12/Sat Oct 31 00:41:26 2020//
/vi.c/1.57/Sat Oct 31 00:41:35 2020//
+/CONTRIBUTORS/1.11/Sun Nov 1 14:26:15 2020//
+/LEGAL/1.2/Sun Nov 1 14:26:15 2020//
+/Makefile/1.39/Sun Nov 1 15:42:33 2020//
+/NOTES/1.16/Sun Nov 1 14:26:15 2020//
+/PROJECTS/1.9/Sun Nov 1 14:26:15 2020//
+/README/1.16/Sun Nov 1 15:42:33 2020//
+/alloc.c/1.19/Sun Nov 1 14:26:15 2020//
+/c_ksh.c/1.62/Sun Nov 1 14:26:15 2020//
+/c_sh.c/1.64/Sun Nov 1 14:26:15 2020//
+/c_test.h/1.4/Sun Nov 1 14:26:15 2020//
+/c_ulimit.c/1.29/Sun Nov 1 14:26:15 2020//
+/edit.h/1.12/Sun Nov 1 14:26:15 2020//
+/expand.h/1.15/Sun Nov 1 14:26:15 2020//
+/expr.c/1.34/Sun Nov 1 14:26:15 2020//
+/jobs.c/1.62/Sun Nov 1 14:26:15 2020//
+/ksh.1/1.210/Sun Nov 1 14:26:15 2020//
+/lex.c/1.78/Sun Nov 1 14:26:15 2020//
+/lex.h/1.21/Sun Nov 1 14:26:15 2020//
+/mail.c/1.27/Sun Nov 1 14:26:15 2020//
+/path.c/1.23/Sun Nov 1 14:26:15 2020//
+/sh.1/1.152/Sun Nov 1 14:26:15 2020//
+/shf.c/1.34/Sun Nov 1 14:26:15 2020//
+/shf.h/1.8/Sun Nov 1 14:26:15 2020//
+/syn.c/1.39/Sun Nov 1 14:26:15 2020//
+/table.c/1.25/Sun Nov 1 14:26:15 2020//
+/table.h/1.15/Sun Nov 1 14:26:15 2020//
+/tree.c/1.34/Sun Nov 1 14:26:15 2020//
+/tree.h/1.12/Sun Nov 1 14:26:15 2020//
+/tty.h/1.6/Sun Nov 1 14:26:15 2020//
+/version.c/1.12/Sun Nov 1 14:26:15 2020//
D
diff --git a/CVS/Entries.Log b/CVS/Entries.Log
@@ -1,2 +0,0 @@
-A D/tests////
-R D/tests////
diff --git a/charclass.h b/charclass.h
@@ -1,13 +1,13 @@
/*
- * Public domain, 2008, Todd C. Miller <Todd.Miller@courtesan.com>
+ * Public domain, 2008, Todd C. Miller <millert@openbsd.org>
*
- * $OpenBSD: charclass.h,v 1.1 2008/10/01 23:04:13 millert Exp $
+ * $OpenBSD: charclass.h,v 1.3 2020/10/13 04:42:28 guenther Exp $
*/
/*
* POSIX character class support for fnmatch() and glob().
*/
-static struct cclass {
+static const struct cclass {
const char *name;
int (*isctype)(int);
} cclasses[] = {
diff --git a/misc.c b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.75 2020/07/22 19:20:41 millert Exp $ */
+/* $OpenBSD: misc.c,v 1.76 2020/10/26 18:16:51 tb Exp $ */
/*
* Miscellaneous functions
@@ -305,6 +305,7 @@ change_flag(enum sh_flag f,
"exec tty", NULL) == -1)
bi_errorf("pledge fail");
#endif
+
dropped_privileges = 1;
} else if (f == FPOSIX && newval) {
Flag(FBRACEEXPAND) = 0;
@@ -715,7 +716,7 @@ do_gmatch(const unsigned char *s, const unsigned char *se,
static int
posix_cclass(const unsigned char *pattern, int test, const unsigned char **ep)
{
- struct cclass *cc;
+ const struct cclass *cc;
const unsigned char *colon;
size_t len;
int rval = 0;
