hush: do not assign to readonly VAR in "VAR=VAL CMD" syntax too

[oweals/busybox.git] / util-linux / volume_id / romfs.c

diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c
index 400bdce2c5ffb096463ebd174e9b89956d41b875..95a65f9ef9b40b5d86e91dce76c25b2632b521a8 100644 (file)
--- a/util-linux/volume_id/romfs.c
+++ b/util-linux/volume_id/romfs.c
@@ -18,17 +18,25 @@
  *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
+
+//config:config FEATURE_VOLUMEID_ROMFS
+//config:      bool "romfs filesystem"
+//config:      default y
+//config:      depends on VOLUMEID
+
 #include "volume_id_internal.h"
 
 struct romfs_super {
        uint8_t magic[8];
        uint32_t size;
        uint32_t checksum;
-       uint8_t name[0];
-} __attribute__((__packed__));
+       uint8_t name[];
+} PACKED;
 
-int volume_id_probe_romfs(struct volume_id *id, uint64_t off)
+int FAST_FUNC volume_id_probe_romfs(struct volume_id *id /*,uint64_t off*/)
 {
+#define off ((uint64_t)0)
        struct romfs_super *rfs;
 
        dbg("probing at offset 0x%llx", (unsigned long long) off);
@@ -46,7 +54,7 @@ int volume_id_probe_romfs(struct volume_id *id, uint64_t off)
                }
 
 //             volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//             id->type = "romfs";
+               IF_FEATURE_BLKID_TYPE(id->type = "romfs";)
                return 0;
        }