Make printf format specifiers 32/64-bit clean.

[bluesky.git] / bluesky / serialize.c

diff --git a/bluesky/serialize.c b/bluesky/serialize.c
index 7cb16a5..c806d88 100644 (file)
--- a/bluesky/serialize.c
+++ b/bluesky/serialize.c
@@ -7,6 +7,7 @@
  */
 
 #include <stdint.h>
+#include <inttypes.h>
 #include <glib.h>
 #include <string.h>
 
@@ -18,7 +19,7 @@
 
 /* Magic signature for serialized inodes. */
 
-#define INODE_MAGIC 0xa6832100943d71e5ULL
+#define INODE_MAGIC 0xa6832100943d71e6ULL
 
 struct serialized_inode {
     uint64_t signature;         /* INODE_MAGIC */
@@ -55,6 +56,9 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
 
     switch (inode->type) {
     case BLUESKY_REGULAR:
+    {
+        uint64_t size = GUINT64_TO_LE(inode->size);
+        g_string_append_len(out, (gchar *)&size, sizeof(uint64_t));
         for (int i = 0; i < inode->blocks->len; i++) {
             BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
             if (b->ref != NULL)
@@ -62,6 +66,32 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
             g_string_append_c(out, '\0');
         }
         break;
+    }
+
+    case BLUESKY_DIRECTORY:
+    {
+        uint32_t seq;
+        uint64_t inum;
+        GSequenceIter *i = g_sequence_get_begin_iter(inode->dirents);
+
+        while (!g_sequence_iter_is_end(i)) {
+            BlueSkyDirent *d = g_sequence_get(i);
+
+            seq = GUINT32_TO_LE(d->cookie);
+            inum = GUINT64_TO_LE(d->inum);
+            g_string_append_len(out, (gchar *)&seq, sizeof(uint32_t));
+            g_string_append_len(out, (gchar *)&inum, sizeof(uint64_t));
+            g_string_append(out, d->name);
+            g_string_append_c(out, '\0');
+
+            i = g_sequence_iter_next(i);
+        }
+
+        seq = GUINT32_TO_LE(0);
+        g_string_append_len(out, (gchar *)&seq, sizeof(uint32_t));
+
+        break;
+    }
     default:
         g_warning("Serialization for inode type %d not implemented!\n",
                   inode->type);
@@ -90,8 +120,13 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
 
     buf += sizeof(struct serialized_inode);
 
+    g_print("Deserializing inode %lld...\n", (long long)inode->inum);
+
+    /* TODO: Bounds checking */
     switch (inode->type) {
     case BLUESKY_REGULAR:
+        inode->size = GINT64_FROM_LE(*(uint64_t *)buf);
+        buf += sizeof(uint64_t);
         g_array_set_size(inode->blocks,
                          (inode->size + BLUESKY_BLOCK_SIZE - 1)
                           / BLUESKY_BLOCK_SIZE);
@@ -102,8 +137,38 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
             buf += strlen(b->ref) + 1;
         }
         break;
+
+    case BLUESKY_DIRECTORY:
+    {
+        struct serialized_dirent {
+            uint32_t seq;
+            uint64_t inum;
+            gchar name[0];
+        } __attribute__((packed));
+
+        struct serialized_dirent *d = (struct serialized_dirent *)buf;
+        while (GUINT32_FROM_LE(d->seq) != 0) {
+            BlueSkyDirent *dirent = g_new(BlueSkyDirent, 1);
+            dirent->cookie = GUINT64_FROM_LE(d->seq);
+            dirent->inum = GUINT64_FROM_LE(d->inum);
+            dirent->name = g_strdup(d->name);
+
+            g_sequence_insert_sorted(inode->dirents, dirent,
+                                     bluesky_dirent_compare, NULL);
+            g_hash_table_insert(inode->dirhash, dirent->name, dirent);
+
+            g_print("  dirent[%08x]: %s -> %"PRIu64"\n",
+                    dirent->cookie, dirent->name, dirent->inum);
+
+            buf = strchr(d->name, '\0') + 1;
+            d = (struct serialized_dirent *)buf;
+        }
+        break;
+    }
     default:
         g_warning("Deserialization for inode type %d not implemented!\n",
                   inode->type);
     }
+
+    return inode;
 }