summaryrefslogtreecommitdiffstats
path: root/source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch
blob: 47c8c2aed14eb8114047523161a5cf5fc9d59d19 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
From 1c677c04c0fa43ecfeccdb9705dbbd19fb356891 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Sun, 4 Apr 2021 21:02:19 +0000
Subject: [PATCH] Don't count each byte encounter as 1, count the total number
 of bytes found (Anatol Belski). This makes it behave like 5.39.

---
 src/encoding.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/encoding.c b/src/encoding.c
index c8b404390..c66703bb6 100644
--- a/src/encoding.c
+++ b/src/encoding.c
@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: encoding.c,v 1.27 2021/02/05 21:33:49 christos Exp $")
+FILE_RCSID("@(#)$File: encoding.c,v 1.28 2021/04/04 21:02:19 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -282,8 +282,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
 	} \
 	u = 0; \
 	for (i = 0; i < __arraycount(dist); i++) { \
-		if (dist[i]) \
-			u++; \
+		u+= dist[i]; \
 	} \
 	if (u < 3) \
 		return 0; \