summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-10-08 09:05:08 +0200
committerJim Meyering <meyering@redhat.com>2009-10-08 09:07:12 +0200
commit8e323907160db1cb3f9425204013597c81384492 (patch)
treed8eddef92f0209fec7e6f53ed05cb645cd070847 /src
parentb95be30e3fc4831391355f89a959d0c503bed5fb (diff)
downloadcoreutils-8e323907160db1cb3f9425204013597c81384492.tar.xz
stat: recognize CIFS and HFS file system types
* src/stat.c (human_fstype) [CIFS, HFS]: Add new file system types. Prompted by a report from Stuart Kemp. Normalize the form of a few hexadecimal magic numbers. Alphabetize on S_MAGIC_ case names. * src/Makefile.am (fs-magic-compare, fs-def, fs-magic): New rules, to automate comparison of our list with that in the Linux statfs man page. * NEWS (Bug fixes): Mention it.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am31
-rw-r--r--src/stat.c18
2 files changed, 42 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0aa7599b4..3bba86d9c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -330,6 +330,37 @@ wheel.h: wheel-gen.pl Makefile.am
# Tell automake to exempt then from that installcheck test.
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false test
+# Compare fs.h with the list of file system names/magic-numbers in the
+# Linux statfs man page. This target prints any new name/number pairs.
+.PHONY: fs-magic-compare
+fs-magic-compare: fs-magic fs-def
+ join -v1 -t@ fs-magic fs-def
+
+CLEANFILES += fs-magic fs-def
+fs-def: fs.h
+ grep '^# *define ' $< > $@-t && mv $@-t $@
+
+fs-magic:
+ man statfs \
+ |perl -ne '/File system types:/.../Nobody kno/ and print' \
+ |grep 0x | perl -p \
+ -e 's/MINIX_SUPER_MAGIC\b/MINIX/;' \
+ -e 's/MINIX_SUPER_MAGIC2\b/MINIX_30/;' \
+ -e 's/MINIX2_SUPER_MAGIC\b/MINIX_V2/;' \
+ -e 's/MINIX2_SUPER_MAGIC2\b/MINIX_V2_30/;' \
+ -e 's/CIFS_MAGIC_NUMBER/CIFS/;' \
+ -e 's/(_SUPER)?_MAGIC//;' \
+ -e 's/\s+0x(\S+)/" 0x" . uc $$1/e;' \
+ -e 's/^\s+//;' \
+ -e 's/^_(XIAFS)/$$1/;' \
+ -e 's/^USBDEVICE/USBDEVFS/;' \
+ -e 's/NTFS_SB/NTFS/;' \
+ -e 's/^/# define S_MAGIC_/;' \
+ -e 's,\s*/\* .*? \*/,,;' \
+ | grep -v S_MAGIC_EXT3 \
+ | LC_ALL=C sort \
+ > $@-t && mv $@-t $@
+
BUILT_SOURCES += fs.h
fs.h: stat.c extract-magic
$(AM_V_GEN)rm -f $@
diff --git a/src/stat.c b/src/stat.c
index 14654b174..87f93b89b 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -225,8 +225,10 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
return "befs";
case S_MAGIC_BFS: /* 0x1BADFACE */
return "bfs";
- case S_MAGIC_BINFMT_MISC: /* 0x42494e4d */
+ case S_MAGIC_BINFMT_MISC: /* 0x42494E4D */
return "binfmt_misc";
+ case S_MAGIC_CIFS: /* 0xFF534D42 */
+ return "cifs";
case S_MAGIC_CODA: /* 0x73757245 */
return "coda";
case S_MAGIC_COH: /* 0x012FF7B7 */
@@ -237,7 +239,7 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
return "devfs";
case S_MAGIC_DEVPTS: /* 0x1CD1 */
return "devpts";
- case S_MAGIC_EFS: /* 0x414A53 */
+ case S_MAGIC_EFS: /* 0x00414A53 */
return "efs";
case S_MAGIC_EXT: /* 0x137D */
return "ext";
@@ -249,9 +251,11 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
return "fat";
case S_MAGIC_FUSECTL: /* 0x65735543 */
return "fusectl";
+ case S_MAGIC_HFS: /* 0x4244 */
+ return "hfs";
case S_MAGIC_HPFS: /* 0xF995E849 */
return "hpfs";
- case S_MAGIC_HUGETLBFS: /* 0x958458f6 */
+ case S_MAGIC_HUGETLBFS: /* 0x958458F6 */
return "hugetlbfs";
case S_MAGIC_ISOFS: /* 0x9660 */
return "isofs";
@@ -259,10 +263,10 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
return "isofs";
case S_MAGIC_ISOFS_WIN: /* 0x4000 */
return "isofs";
- case S_MAGIC_JFFS2: /* 0x72B6 */
- return "jffs2";
case S_MAGIC_JFFS: /* 0x07C0 */
return "jffs";
+ case S_MAGIC_JFFS2: /* 0x72B6 */
+ return "jffs2";
case S_MAGIC_JFS: /* 0x3153464A */
return "jfs";
case S_MAGIC_LUSTRE: /* 0x0BD00BD0 */
@@ -285,7 +289,7 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
return "nfsd";
case S_MAGIC_NTFS: /* 0x5346544E */
return "ntfs";
- case S_MAGIC_OPENPROM: /* 0x9fa1 */
+ case S_MAGIC_OPENPROM: /* 0x9FA1 */
return "openprom";
case S_MAGIC_PROC: /* 0x9FA0 */
return "proc";
@@ -307,7 +311,7 @@ human_fstype (STRUCT_STATVFS const *statfsbuf)
return "sysv2";
case S_MAGIC_SYSV4: /* 0x012FF7B5 */
return "sysv4";
- case S_MAGIC_TMPFS: /* 0x1021994 */
+ case S_MAGIC_TMPFS: /* 0x01021994 */
return "tmpfs";
case S_MAGIC_UDF: /* 0x15013346 */
return "udf";