diff options
| -rw-r--r-- | cfg.mk | 8 | ||||
| -rw-r--r-- | src/stat.c | 6 |
2 files changed, 11 insertions, 3 deletions
@@ -577,6 +577,14 @@ sc_marked_devdiagnostics: halt='found marked developer diagnostic(s)' \ $(_sc_search_regexp) +# Ensure we keep hex constants as 4 or 8 bytes for consistency +# and so that make src/fs-magic-compare works consistently +sc_fs-magic-compare: + @sed -n 's|.*/\* \(0x[0-9A-Fa-f]\{1,\}\) .*\*/|\1|p' \ + $(srcdir)/src/stat.c | grep -Ev '^0x([0-9A-F]{4}){1,2}$$' \ + && { echo '$(ME): Constants in src/stat.c should be 4 or 8' \ + 'upper-case chars' 1>&2; exit 1; } || : + # Override the default Cc: used in generating an announcement. announcement_Cc_ = $(translation_project_), \ coreutils@gnu.org, coreutils-announce@gnu.org diff --git a/src/stat.c b/src/stat.c index 7d43eb555..148ff49cc 100644 --- a/src/stat.c +++ b/src/stat.c @@ -316,7 +316,7 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) return "fusectl"; case S_MAGIC_FUTEXFS: /* 0x0BAD1DEA local */ return "futexfs"; - case S_MAGIC_GFS: /* 0x1161970 remote */ + case S_MAGIC_GFS: /* 0x01161970 remote */ return "gfs/gfs2"; case S_MAGIC_GPFS: /* 0x47504653 remote */ return "gpfs"; @@ -326,7 +326,7 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) return "hfs+"; case S_MAGIC_HFS_X: /* 0x4858 local */ return "hfsx"; - case S_MAGIC_HOSTFS: /* 0xC0FFEE local */ + case S_MAGIC_HOSTFS: /* 0x00C0FFEE local */ return "hostfs"; case S_MAGIC_HPFS: /* 0xF995E849 local */ return "hpfs"; @@ -378,7 +378,7 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) return "ntfs"; case S_MAGIC_OPENPROM: /* 0x9FA1 local */ return "openprom"; - case S_MAGIC_OCFS2: /* 0x7461636f remote */ + case S_MAGIC_OCFS2: /* 0x7461636F remote */ return "ocfs2"; case S_MAGIC_PANFS: /* 0xAAD7AAEA remote */ return "panfs"; |