From: Pádraig Brady <P@draigBrady.com>
Date: Tue, 27 Oct 2020 20:00:43 +0000 (+0000)
Subject: maint: cleanup operation of fs-magic-compare
X-Git-Tag: v9.0~193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53324dd6112840c0cdd2f87bc775c99cf900a308;p=thirdparty%2Fcoreutils.git

maint: cleanup operation of fs-magic-compare

* src/local.mk: Ensure we map 2 hex digits to 4,
so that we don't output already handled Z3FOLD file system (0x33).
Also hide the generation command for src/fs.h.
---

diff --git a/src/local.mk b/src/local.mk
index 3894556f34..79c655036e 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -511,7 +511,7 @@ src/fs-magic-compare: src/fs-magic src/fs-kernel-magic src/fs-def
 
 CLEANFILES += src/fs-def
 src/fs-def: src/fs.h
-	grep '^# *define ' src/fs.h | $(ASSORT) > $@-t && mv $@-t $@
+	@grep '^# *define ' src/fs.h | $(ASSORT) > $@-t && mv $@-t $@
 
 # Massage bits of the statfs man page and definitions from
 # /usr/include/linux/magic.h to be in a form consistent with what's in fs.h.
@@ -525,6 +525,7 @@ fs_normalize_perl_subst =			\
   -e 's/AFS_FS/KAFS/;'				\
   -e 's/(_SUPER)?_MAGIC//;'			\
   -e 's/\s+0x(\S+)/" 0x" . uc $$1/e;'		\
+  -e 's/(\s+0x)(\X{2})\b/$${1}00$$2/;'		\
   -e 's/(\s+0x)(\X{3})\b/$${1}0$$2/;'		\
   -e 's/(\s+0x)(\X{6})\b/$${1}00$$2/;'		\
   -e 's/(\s+0x)(\X{7})\b/$${1}0$$2/;'		\