]> granicus.if.org Git - strace/commitdiff
statfs: don't quote f_type macro names
authorZev Weiss <zev@bewilderbeest.net>
Sun, 24 Apr 2016 23:32:33 +0000 (18:32 -0500)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 25 Apr 2016 01:54:05 +0000 (01:54 +0000)
* statfs.c (sprintfstype): Don't add double-quotes to fs magic macros.
* tests/statfs.expected: Remove double-quotes.

statfs.c
tests/statfs.expected

index bd3c7ba13383397cf0fa0cb1fc49da668054ba43..882ee9c1b4e75d2b51db7f4c6032f4d9f5310330 100644 (file)
--- a/statfs.c
+++ b/statfs.c
@@ -44,10 +44,8 @@ sprintfstype(const unsigned int magic)
        const char *s;
 
        s = xlat_search(fsmagic, ARRAY_SIZE(fsmagic), magic);
-       if (s) {
-               sprintf(buf, "\"%s\"", s);
-               return buf;
-       }
+       if (s)
+               return s;
        sprintf(buf, "%#x", magic);
        return buf;
 }
index 93e2b515069925439ed67f2b11d62aed48202665..f39013b82475c3db7999e4e314139d3a4fe86c86 100644 (file)
@@ -1 +1 @@
-statfs(64)?\("/proc/self/status"(, [1-9][0-9]*)?, \{f_type="PROC_SUPER_MAGIC", f_bsize=[1-9][0-9]*, f_blocks=[0-9]+, f_bfree=[0-9]+, f_bavail=[0-9]+, f_files=[0-9]+, f_ffree=[0-9]+, f_fsid=\{[0-9]+, [0-9]+\}, f_namelen=[1-9][0-9]*(, f_frsize=[0-9]+)?(, f_flags=[0-9]+)?\}\) += 0
+statfs(64)?\("/proc/self/status"(, [1-9][0-9]*)?, \{f_type=PROC_SUPER_MAGIC, f_bsize=[1-9][0-9]*, f_blocks=[0-9]+, f_bfree=[0-9]+, f_bavail=[0-9]+, f_files=[0-9]+, f_ffree=[0-9]+, f_fsid=\{[0-9]+, [0-9]+\}, f_namelen=[1-9][0-9]*(, f_frsize=[0-9]+)?(, f_flags=[0-9]+)?\}\) += 0