libmagic: fail on all state transfer errors

Also do not report debugging information by default.

Change-Id: I5d80a3df3c3ecc16a577d88abe6e37a792add747

diff --git a/minix/llvm/include/st/callback.h b/minix/llvm/include/st/callback.h
index 9287508ccefe4613e8b889ea36ec02b8bd01a2e4..42cc6fabb834fee5700b52c635b834b10fd342b8 100644 (file)
--- a/minix/llvm/include/st/callback.h
+++ b/minix/llvm/include/st/callback.h
@@ -114,7 +114,7 @@ PUBLIC void st_cb_map_selement_generic(_magic_selement_t *cached_selement, _magi
 #define ST_CB_PRINT_DBG     0x02
 #define ST_CB_PRINT_ERR     0x04
 #define ST_CB_FORCE_IXFER   0x08
-#define ST_CB_DEFAULT_FLAGS (ST_CB_PRINT_DBG|ST_CB_PRINT_ERR)
+#define ST_CB_DEFAULT_FLAGS (ST_CB_PRINT_ERR)
 #define ST_CB_FLAG(F) (cb_info->st_cb_flags & F)
 
 #define ST_CB_DBG ST_CB_PRINT_DBG

diff --git a/minix/llvm/static/magic/magic_st.c b/minix/llvm/static/magic/magic_st.c
index 1af9f00b76e54671e6d6af16739e59d7584e40f2..82ca4249279a1e21300b90f502a1f69a9b312282 100644 (file)
--- a/minix/llvm/static/magic/magic_st.c
+++ b/minix/llvm/static/magic/magic_st.c
@@ -18,7 +18,7 @@ EXTERN endpoint_t sef_self_endpoint;
 #define DO_SKIP_UNPAIRED_PTR_TARGETS 1
 #endif
 
-#define DO_SKIP_INVARIANTS_VIOLATIONS 1
+#define DO_SKIP_INVARIANTS_VIOLATIONS 0
 
 PRIVATE st_alloc_pages *st_alloc_pages_current = NULL;
 PRIVATE int st_alloc_buff_available = 0;