ntpd: default to FEATURE_NTP_AUTH=y

[oweals/busybox.git] / coreutils / stat.c

diff --git a/coreutils/stat.c b/coreutils/stat.c
index 4e926a9087ca8c7ea666101b263dbc147f5a5450..3d527ae63d5b1ccf2a7094c97e5c5ac3d97d71e0 100644 (file)
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -212,7 +212,7 @@ static const char *human_fstype(uint32_t f_type)
                { 0x52654973, "reiserfs" },
                { 0x28cd3d45, "cramfs" },
                { 0x7275,     "romfs" },
-               { 0x858458f6, "romfs" },
+               { 0x858458f6, "ramfs" },
                { 0x73717368, "squashfs" },
                { 0x62656572, "sysfs" },
                { 0, "UNKNOWN" }
@@ -759,14 +759,19 @@ int stat_main(int argc UNUSED_PARAM, char **argv)
        IF_FEATURE_STAT_FORMAT(char *format = NULL;)
        int i;
        int ok;
-       unsigned opts;
        statfunc_ptr statfunc = do_stat;
+#if ENABLE_FEATURE_STAT_FILESYSTEM || ENABLE_SELINUX
+       unsigned opts;
 
-       opt_complementary = "-1"; /* min one arg */
-       opts = getopt32(argv, "tL"
+       opts =
+#endif
+       getopt32(argv, "^"
+               "tL"
                IF_FEATURE_STAT_FILESYSTEM("f")
                IF_SELINUX("Z")
-               IF_FEATURE_STAT_FORMAT("c:", &format)
+               IF_FEATURE_STAT_FORMAT("c:")
+               "\0" "-1" /* min one arg */
+               IF_FEATURE_STAT_FORMAT(,&format)
        );
 #if ENABLE_FEATURE_STAT_FILESYSTEM
        if (opts & OPT_FILESYS) /* -f */